Index: /applications/editors/josm/i18n/po/ar.po
===================================================================
--- /applications/editors/josm/i18n/po/ar.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/ar.po	(revision 17069)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
-"PO-Revision-Date: 2009-08-04 10:38+0000\n"
-"Last-Translator: Zargonovski <zargonovski@gmail.com>\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
+"PO-Revision-Date: 2009-08-10 13:12+0000\n"
+"Last-Translator: Zrouga Mohamed <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\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: 2009-08-10 11:57+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -57,6 +57,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -66,5 +66,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -101,6 +101,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "خطأ"
@@ -111,5 +111,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "التغييرات غير المحفوظة"
@@ -129,10 +129,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -149,15 +149,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -187,6 +187,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -216,5 +216,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -370,5 +370,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
 msgstr ""
@@ -452,9 +452,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -487,7 +487,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -568,37 +568,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "المعطيات"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "الطبقة"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "الخيار"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "التناقض"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "نزّل"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "زوم الى {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "كبّر/صغّر الرؤية إلى {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -608,30 +608,30 @@
 msgstr "أعرض: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "لا يوجد شيء محدد للتكبير/للتصغير."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "لا  تناقضات للتكبير عليها"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "ادمج الطريق"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "ادمج عدة طرق في طريق واحدة."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "الرجاء إختر على الأقل طريقتين للدمج."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr "ادمج الطرقات رغم إختلاف عضويتها ؟"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -639,13 +639,13 @@
 msgstr "إن للطرقات المختارة عضويات في علاقات مختلفة. هل تريد دمجها رغم ذلك ؟"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "على أي حال ادمج"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "غيّر الإتجاه ؟"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -653,10 +653,10 @@
 msgstr "لا يمكن ضمّ الطرقات في إتجاهاتها الحالية. هل تريد عكس إتجاهات بعضها ؟"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "أعكس  ثم إدمج"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -664,20 +664,20 @@
 msgstr "ادخل القيم لكل التناقضات."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "حلل التناقضات"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "ادمج {0} طرقات"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "كل الطرقات كانت فارغة"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -722,6 +722,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -743,6 +743,6 @@
 msgstr "امحي الأغراض المختارة."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -752,5 +752,5 @@
 msgstr "الكتابة فوقه"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -882,7 +882,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "صدّر المعطيات إلى ملف GPX..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -898,5 +897,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -914,5 +913,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -984,22 +983,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "إدمج العقد"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "الرجاء إختيار على الأقل عقدتين للدمج."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr "دمج العقد رغم عضويتها المختلفة ؟"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1007,13 +1006,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "ادمجعلى كلّ حال"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "غير قادر على دمج العقد: فسيتم محو طريق هو قيد الإستعمال."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1267,7 +1266,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "لم تفتح أي مستند لذالك لم يتم تحميل أي شيء."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1848,5 +1846,5 @@
 msgstr "أخطاء عند التنزيل"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1858,5 +1856,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr ""
@@ -1893,11 +1891,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2035,5 +2033,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2104,5 +2102,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "بحث عن أغراض."
@@ -2226,5 +2224,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "إبحث"
@@ -2423,5 +2421,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2464,5 +2462,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr "أمحي من العلاقة"
@@ -2499,13 +2497,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "إدمج {0} عقد"
-msgstr[1] "إدمج {0} عقد"
-msgstr[2] "إدمج {0} عقد"
-msgstr[3] "إدمج {0} عقد"
-msgstr[4] "إدمج {0} عقد"
-msgstr[5] "إدمج {0} عقد"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2541,13 +2535,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "{0} عقدة"
-msgstr[1] "{0} عقدتين"
-msgstr[2] "{0} عقدات"
-msgstr[3] "{0} عقد"
-msgstr[4] "{0} عقد"
-msgstr[5] "{0} عقد"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2709,7 +2699,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "غيّر غرض {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2719,5 +2709,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2772,5 +2762,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2807,5 +2797,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2819,5 +2809,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "خط سكة حديد"
@@ -2832,5 +2822,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3113,5 +3103,5 @@
 msgstr "لا تظهر مرة اخرى"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3120,5 +3110,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3128,10 +3118,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3139,25 +3129,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "مجهول"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3167,9 +3157,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3178,9 +3168,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "الشذوذ غيرال متوقع"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3190,9 +3192,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "مضيف غير معروف"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3202,5 +3204,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr ""
@@ -3284,10 +3286,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "إسم المستخدم"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "كلمة‌المرور"
@@ -3489,15 +3491,15 @@
 msgstr "(لا يوجد أي غرض)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "الطبقة ليست في اللائحة."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3551,5 +3553,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr ""
@@ -3558,5 +3560,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr ""
@@ -3565,20 +3567,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3588,6 +3590,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3595,6 +3597,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3602,40 +3604,40 @@
 msgstr "الأعضاء"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3643,74 +3645,74 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3718,30 +3720,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3749,5 +3751,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3755,13 +3757,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3769,5 +3771,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3775,21 +3777,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3798,27 +3800,27 @@
 msgstr "أزِل"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3826,5 +3828,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3833,5 +3835,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3840,5 +3842,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3847,5 +3849,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -3854,21 +3856,21 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -3878,5 +3880,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -3886,5 +3888,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -3892,19 +3894,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -3913,19 +3915,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -3934,9 +3936,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -3946,13 +3948,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -3960,90 +3962,90 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "تم حذفه"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4053,17 +4055,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4072,14 +4074,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4087,21 +4089,21 @@
 msgstr "الدّور"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4109,14 +4111,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4124,7 +4126,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4136,7 +4138,7 @@
 msgstr "المفتاح"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4149,45 +4151,45 @@
 msgstr "القيمة"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr ""
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4207,8 +4209,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4245,5 +4247,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4345,83 +4347,83 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "الطبقات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "إفتح لائحة بكلّ التبقات المحملة."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "أمحي الطبقة المختارة."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr "أمحي الطبقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "عرض/إخفاء"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "أنقل الطبقة المختارة صفّ إلى الأعلى."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "أنقل الطبقة المختارة صفّ إلى الأسفل."
@@ -4431,6 +4433,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4439,22 +4441,22 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "قيمة فارغة ستمحي المفتاح."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<مختلف>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "غيّر القيم ؟"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4462,5 +4464,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4469,40 +4471,40 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "الرجاء إختيار مفتاح"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "الرجاء إختيار قيمة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 msgid "Please select the objects you want to change properties for."
 msgstr "الرجاء إختيار الأغراض اللتي تريد تغيير خصائصها."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "خصائص/عضويات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "خصائص الأغراض المختارة."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "عضو من"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "أضف صفة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4519,39 +4521,39 @@
 msgstr "أضِف"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 msgid "Add a new key/value pair to all objects"
 msgstr "أضف زوج جديد مفتاح/قيمة إلى كلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "حرّر الخصائص"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 msgid "Edit the value of the selected key for all objects"
 msgstr "حرّر المحتاح المنقى لكلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "الخصائص: {0} / العضويات: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "الخصائص/ العضويات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "غيّر العلاقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "هل حقاً أمحي الخيار من العلاقة {0} ؟"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "أمحي المفتاح المنتقى من كلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "أمحي الخصائص"
@@ -4563,5 +4565,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "العلاقات"
@@ -4593,31 +4595,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "الخيار الحالي"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "إفتح نافذة لائحة خيارات."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "إنعاش لائحة الخيارات."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "الخيار: علاقات:{0} / طرقات:{1} / عقد:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4625,5 +4627,5 @@
 msgstr "الخيار"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4636,5 +4638,5 @@
 msgstr[5] "{0} طريق"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4643,5 +4645,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -4851,7 +4853,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "أمحي العلاقة المحددة"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -4934,5 +4935,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5171,5 +5172,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "الأماكن"
@@ -5216,21 +5217,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "النوع"
@@ -6030,149 +6031,149 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
-#: build/trans_presets.java:1856 build/trans_presets.java:1862
-#: build/trans_presets.java:1868 build/trans_presets.java:1874
-#: build/trans_presets.java:1880 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1898
-#: build/trans_presets.java:1904 build/trans_presets.java:1910
-#: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2012
-#: build/trans_presets.java:2018 build/trans_presets.java:2024
-#: build/trans_presets.java:2030 build/trans_presets.java:2036
-#: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
 #: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
 msgid "Name"
 msgstr "الإسم"
@@ -6268,5 +6269,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -6304,5 +6305,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -6310,30 +6311,30 @@
 msgstr "نقطة gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "إستعمل الإعدادات العامة."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "أرسم خطوط بين النقاط لهذه الطبقة."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "لا ترسم خطوط بين النقاط لهذه الطبقة."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "حدد خيارات رسم الخطوط"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
@@ -6341,5 +6342,5 @@
 msgstr "خصّص اللون"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -6348,5 +6349,5 @@
 msgstr "الغيابي"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
@@ -6355,31 +6356,31 @@
 msgstr "إختر لون"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
 msgid "Import Audio"
 msgstr "إستورد صوت مسجل"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
 msgid "Wave Audio files (*.wav)"
 msgstr "ملفات صوتيت (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "العلامات الصوتية من {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
 msgid "Import images"
 msgstr "إستورد صور"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
 #, java-format
 msgid "{0} track, "
@@ -6388,5 +6389,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
 #, java-format
 msgid "{0} route, "
@@ -6395,5 +6396,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
 #, java-format
 msgid "{0} waypoint"
@@ -6402,10 +6403,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
 #, java-format
 msgid "Name: {0}"
 msgstr "الإسم: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
 #, java-format
@@ -6413,18 +6414,18 @@
 msgstr "الوصف: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
 msgid "Timespan: "
 msgstr "الفترة الزمنية "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 msgid "Length: "
 msgstr "الطول: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
@@ -6435,10 +6436,10 @@
 "مضرة.<br>أنظر هنا إذا أردت تحميل بعض الأثرات:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
@@ -6449,29 +6450,29 @@
 msgstr "محوّل من: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
 msgid "Download from OSM along this track"
 msgstr "نزّل من أو.أس.أم على طول هذا المسلك"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
 msgid "Download everything within:"
 msgstr "نزّل كلّ شيئ بين:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
 #, java-format
 msgid "{0} meters"
 msgstr "{0} أمتار"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
 msgid "Maximum area per request:"
 msgstr "المساحة القصوى للمطلب:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} كلم²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
 #, java-format
 msgid ""
@@ -6480,9 +6481,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6490,5 +6491,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6539,21 +6540,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -6939,5 +6940,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "السيارة"
@@ -6954,16 +6955,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "الدراجة"
@@ -6991,14 +6994,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "المشي"
@@ -7206,19 +7212,19 @@
 msgstr "اللغة"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr "تمكين الغيابيات المبيتة"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr ""
@@ -7348,35 +7354,11 @@
 msgstr "كلمة المرور عند مخدم التوكيل"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr "كلمة المرور للحساب أو.أس.أم. أترك فراغ كي لا يتم حفظ أي كلمة مرور."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "URL الخادم الأساسي"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "كلمة المرور أو.أس.أم"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -7729,7 +7711,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "لم أتمكن من قراءة \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -7832,7 +7814,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "دور غير معروف ''{0}''."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -7990,23 +7972,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "الإسم أو كلمة المرور خطأ"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "تحذير: يتم نقل كلمة المرور بدون تعتيم"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "إحفظ المستخدم و كلمة المرور (غير معتمة)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "أدخل كلمة المرور"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
 msgstr "دخول"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr "كلمة المرور للحساب أو.أس.أم. أترك فراغ كي لا يتم حفظ أي كلمة مرور."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "كلمة المرور أو.أس.أم"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -8169,14 +8175,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "نوع عضو غير معروف لِــ ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "حضّر المعطيات أو.أس.أم ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr "ضذوذ تكوين معرف العقدة"
@@ -8602,5 +8608,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr ""
@@ -9001,5 +9007,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr ""
@@ -9324,5 +9330,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -9858,7 +9864,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr "الماء"
@@ -10031,7 +10037,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "الإسم"
+msgstr ""
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10581,12 +10586,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "{0} أمتار"
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0} عقدة"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -10724,5 +10729,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr "إسم الشارع"
@@ -11531,7 +11536,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr ""
@@ -11545,5 +11550,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr ""
@@ -11776,12 +11781,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "الرجاء إختيار أربعة عقد على الأقل."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "أمحي الطبقة"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
@@ -11794,7 +11797,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "لا يوجد تغييرات للتحميل."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -11805,61 +11807,61 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr ""
@@ -12187,4 +12189,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12221,5 +12225,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr ""
@@ -12230,5 +12234,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr ""
@@ -12237,5 +12241,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr ""
@@ -12262,8 +12266,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr ""
@@ -12304,21 +12308,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr ""
@@ -12332,8 +12336,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr ""
@@ -12351,15 +12355,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -12396,16 +12400,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr ""
@@ -12447,19 +12451,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr ""
@@ -12495,19 +12499,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr ""
@@ -12541,18 +12545,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr ""
@@ -12586,18 +12590,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr ""
@@ -12605,5 +12609,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr ""
@@ -12612,5 +12616,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr ""
@@ -12618,5 +12622,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr ""
@@ -12625,5 +12629,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr ""
@@ -12633,6 +12637,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr ""
@@ -12640,5 +12644,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr ""
@@ -12647,5 +12651,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr ""
@@ -12658,5 +12662,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr ""
@@ -12665,5 +12669,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr ""
@@ -12671,10 +12675,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr ""
@@ -12686,5 +12690,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr ""
@@ -12694,5 +12698,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr ""
@@ -12700,5 +12704,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr ""
@@ -12708,5 +12712,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr ""
@@ -12718,5 +12722,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr ""
@@ -12726,5 +12730,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr ""
@@ -12751,19 +12755,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr ""
@@ -12775,5 +12779,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr ""
@@ -12782,5 +12786,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr ""
@@ -12804,13 +12808,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr ""
@@ -12830,20 +12834,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr ""
@@ -12851,12 +12855,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr ""
@@ -12864,5 +12868,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr ""
@@ -12871,5 +12875,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr ""
@@ -12877,5 +12881,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr ""
@@ -12884,5 +12888,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr ""
@@ -12892,18 +12896,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr ""
@@ -12911,5 +12915,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr ""
@@ -12919,5 +12923,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -12925,5 +12929,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -12932,5 +12936,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -12939,20 +12943,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr ""
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -12965,8 +12969,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr ""
@@ -13010,23 +13014,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr ""
@@ -13039,40 +13043,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr ""
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr ""
@@ -13085,19 +13089,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr ""
@@ -13120,65 +13124,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr ""
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr ""
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -13193,10 +13197,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr ""
@@ -13212,13 +13216,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr "الدراجة النارية"
@@ -13234,30 +13238,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr ""
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr ""
@@ -13265,25 +13269,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr "الإرتفاع الأقصى (أمتار)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr ""
@@ -13294,5 +13298,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr ""
@@ -13314,9 +13318,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr "النوع"
@@ -13336,10 +13340,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr ""
@@ -13361,10 +13365,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr ""
@@ -13386,10 +13390,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr ""
@@ -13411,6 +13415,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr ""
@@ -13424,9 +13428,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr ""
@@ -13440,9 +13444,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr "شارع سكني"
@@ -13472,10 +13476,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr ""
@@ -13483,4 +13487,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13498,6 +13509,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr ""
@@ -13508,10 +13519,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr "حرّر جسر"
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr "حرّر خندق"
@@ -13519,19 +13530,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr ""
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr ""
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr ""
@@ -13547,5 +13558,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr ""
@@ -13554,5 +13565,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr ""
@@ -13560,5 +13571,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr ""
@@ -13566,5 +13577,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr ""
@@ -13574,5 +13585,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr "حرّر طريق للدراجات"
@@ -13580,5 +13591,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr "طريق قدم"
@@ -13587,5 +13598,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr "حرّر طريق قدم"
@@ -13593,5 +13604,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr "المشاة"
@@ -13600,5 +13611,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr "حرّر شارع للمشاة"
@@ -13606,5 +13617,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr "درجات"
@@ -13614,5 +13625,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr ""
@@ -13621,5 +13632,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr ""
@@ -13628,14 +13639,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr ""
@@ -13643,18 +13654,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr ""
@@ -13662,5 +13673,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr ""
@@ -13669,5 +13680,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr ""
@@ -13675,5 +13686,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr ""
@@ -13682,5 +13693,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr ""
@@ -13688,5 +13699,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr ""
@@ -13695,5 +13706,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr ""
@@ -13701,5 +13712,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr ""
@@ -13708,5 +13719,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr ""
@@ -13714,5 +13725,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr ""
@@ -13721,5 +13732,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -13728,5 +13739,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr ""
@@ -13735,13 +13746,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr ""
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr ""
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr ""
@@ -13749,5 +13760,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr ""
@@ -13757,5 +13768,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr ""
@@ -13763,5 +13774,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr ""
@@ -13771,5 +13782,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr ""
@@ -13777,5 +13788,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr ""
@@ -13785,5 +13796,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr ""
@@ -13791,5 +13802,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr ""
@@ -13799,5 +13810,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr ""
@@ -13805,5 +13816,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr ""
@@ -13813,5 +13824,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr ""
@@ -13819,5 +13830,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr ""
@@ -13827,5 +13838,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr ""
@@ -13833,10 +13844,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr "تقاطع طرقات سريعة"
@@ -13844,15 +13855,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr "حرّر تقاطع طرقات سريعة"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr "الرقم"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr "الخدمات"
@@ -13860,5 +13871,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr "حرّر محطة خدمات"
@@ -13893,14 +13904,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr "شركة الإدارة"
@@ -13909,5 +13920,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr "إشارة سير"
@@ -13917,5 +13928,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr "نوع التقاطع للمشاة"
@@ -13924,27 +13935,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr "إشارات_السير"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr "جزيرة"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr ""
@@ -13952,6 +13963,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr ""
@@ -13960,11 +13971,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -13972,30 +13983,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr "طير الطوقان"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr "نمر"
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr "إشارة وقوف"
@@ -14003,5 +14014,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr "تقاطع مشاة"
@@ -14010,14 +14021,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr "مستديرة صغيرة"
@@ -14028,14 +14039,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr "الإتجاه"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr "إتجاه عقارب الساعة"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr ""
@@ -14045,20 +14056,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr "حدود المدينة"
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr "الإسم الثاني"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr "كاميرا مراقبة السير"
@@ -14066,5 +14077,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr "هاتف طوارئ"
@@ -14072,5 +14083,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr ""
@@ -14078,5 +14089,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr ""
@@ -14085,10 +14096,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr ""
@@ -14096,5 +14107,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr ""
@@ -14102,5 +14113,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -14112,7 +14123,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr "إرتفاع"
@@ -14120,5 +14131,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr "حواجز"
@@ -14126,5 +14137,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr ""
@@ -14132,5 +14143,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr ""
@@ -14169,18 +14180,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr "السير المسموح:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr "حاجز دراجة"
@@ -14189,5 +14204,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr ""
@@ -14195,5 +14210,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr ""
@@ -14201,10 +14216,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr ""
@@ -14212,15 +14227,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr ""
@@ -14228,5 +14243,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr ""
@@ -14234,10 +14249,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr "مراقبة الحدود"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr "حرّر مراقبة الحدود"
@@ -14247,5 +14262,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr ""
@@ -14254,5 +14269,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr ""
@@ -14261,5 +14276,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr "حائط/جدار"
@@ -14267,5 +14282,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr "حائط/جدار مدينة"
@@ -14274,5 +14289,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr ""
@@ -14284,15 +14299,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr ""
@@ -14300,50 +14315,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr ""
@@ -14351,15 +14366,26 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+msgid "Turnstile"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "حرّر خندق"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr ""
@@ -14370,10 +14396,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr "الماء"
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr "نبع"
@@ -14381,5 +14407,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr "حرّر نبع"
@@ -14387,5 +14413,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr "مسرب"
@@ -14393,10 +14419,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr "حرّر مسرب"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr "جدول نهر"
@@ -14404,10 +14430,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr "حرّر جدول نهر"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr "قناة"
@@ -14415,10 +14441,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr "حرّر قناة"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr "نهر"
@@ -14428,5 +14454,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr "نهر"
@@ -14434,15 +14460,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr "حرّر الماء"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr "الأرض اليابسة"
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr "حرّر الأرض اليابسة"
@@ -14450,15 +14476,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr "حوض"
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr "حرّر حوض"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr "خزان"
@@ -14466,15 +14492,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr "حرّر خزان"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr "خزان مغطى"
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr "حرّر خزان مغطى"
@@ -14482,5 +14508,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr "ضفة نهر"
@@ -14489,10 +14515,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr "حرّر ضفة نهر"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr "أراضي رطبة"
@@ -14503,14 +14529,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr "حرّ أراضي رطبة"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr "مستنقع"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr ""
@@ -14524,35 +14550,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr "شجر إستوائي"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr "وحل"
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr "حرّر وحل"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr "شاطئ بحر"
@@ -14560,20 +14586,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr "حرّر شاطئ بحر"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr "خليج"
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr "حرّر خليج"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr "منحدر صخري"
@@ -14581,10 +14607,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr "حرّر منحدر صخري"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr "شاطئ"
@@ -14592,5 +14618,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr "حرّر شاطئ"
@@ -14598,5 +14624,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr ""
@@ -14604,5 +14630,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr ""
@@ -14611,5 +14637,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr "حوض سفن"
@@ -14617,10 +14643,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr "حرّر حوض سفن"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr "مرسى"
@@ -14628,5 +14654,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr "حرّر مرسى"
@@ -14634,5 +14660,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr "سدّ"
@@ -14640,15 +14666,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr "حرّر سدّ"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr "نقطة مجرى ماء"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr ""
@@ -14657,5 +14683,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr "سدّ (صغير)"
@@ -14663,20 +14689,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr "سدّ (صغير)"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr "شلال ماء"
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr "حرّر شلال ماء"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr ""
@@ -14685,15 +14711,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr "مارينا"
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr "حرّر مارينا"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr "رصيف ميناء"
@@ -14701,10 +14727,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr "حرّر رصيف ميناء"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr ""
@@ -14712,10 +14738,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr ""
@@ -14725,5 +14751,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr ""
@@ -14731,10 +14757,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr "سكة حديدية"
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr "سكة"
@@ -14742,5 +14768,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr "حرّر سكة"
@@ -14770,8 +14796,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr ""
@@ -14785,35 +14811,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr "قطار ذات سكة حديد واحدة"
@@ -14821,45 +14847,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr "حرّر قطار ذات سكة حديد واحدة"
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr ""
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr "قطار نفقي"
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr "حرّر قطار نفقي"
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr "ترام"
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr "حرّر ترام"
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr ""
@@ -14867,5 +14893,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -14874,14 +14900,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr "سكة حديد غير مستعملة"
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr "حرّر سكة حديد غير مستعملة"
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr "سكة حديد مهجورة"
@@ -14890,5 +14916,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr ""
@@ -14897,5 +14923,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr ""
@@ -14905,5 +14931,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr ""
@@ -14911,5 +14937,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr ""
@@ -14918,10 +14944,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr "مصعد كرسي"
@@ -14929,10 +14955,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr "حرّر مصعد كرسي"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr ""
@@ -14940,10 +14966,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr ""
@@ -14951,10 +14977,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr ""
@@ -14962,5 +14988,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr ""
@@ -14968,5 +14994,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr "محطة"
@@ -14977,10 +15003,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr "حرّر محطة"
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr "وقود"
@@ -14990,5 +15016,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr "حرّر وقود"
@@ -15004,5 +15030,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15012,5 +15038,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr "موقف سيارات"
@@ -15018,41 +15044,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr "إستيعاب"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr "مساحة"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr "متعدد الطوابق"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr "تحت الأرض"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr "رسم دخول/إجرة"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr "غسيل سيارات"
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr "حرّر غسيل سيارات"
@@ -15060,5 +15086,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr ""
@@ -15066,15 +15092,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr "حرّر متجر سيارات"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr "تصليح سيارات"
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr "حرّر تصليح سيارات"
@@ -15082,5 +15108,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr "إستئجار سيارة"
@@ -15089,10 +15115,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr "حرّر إستئجار سيارة"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr "مشاركة السيارة"
@@ -15100,5 +15126,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr "حرّر مشاركة السيارة"
@@ -15106,5 +15132,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr "حرّر موقف دراجة"
@@ -15113,5 +15139,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr "حرر إستأجار دراجة"
@@ -15120,15 +15146,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr "حرر مبيع قطع دراجات"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "النقل المشترك"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr ""
@@ -15136,5 +15162,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr "موقف قطار"
@@ -15142,5 +15168,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr "حرّر موقف"
@@ -15148,5 +15174,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr "موقف ترام"
@@ -15155,5 +15181,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr "حرر موقف ترام"
@@ -15161,5 +15187,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr "رصيف محطة القطار"
@@ -15168,5 +15194,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr "حرّر رصيف محطة القطار"
@@ -15178,5 +15204,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr ""
@@ -15184,10 +15210,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr "مساحة"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr "مدخل قطار نفقي"
@@ -15196,10 +15222,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr "حرّر مدخل قطار نفقي"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr "مناسب لكرسي المقعدين"
@@ -15208,5 +15234,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr "محطة حافلة نقل جماعي (باص)"
@@ -15215,5 +15241,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr "حرّر محطة حافلة نقل جماعي (باص)"
@@ -15221,5 +15247,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr "موقف محطة حافلة نقل جماعي"
@@ -15229,5 +15255,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr "حرّر موقفحافلة نقل جماعي (باص)"
@@ -15238,6 +15264,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr "ملجأ"
@@ -15245,10 +15271,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr ""
@@ -15256,5 +15282,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr "تاكسي"
@@ -15262,5 +15288,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr "حرّر موقف تاكسي"
@@ -15268,5 +15294,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr "مطار"
@@ -15274,15 +15300,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr ""
@@ -15291,5 +15317,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr "مكان المبيت"
@@ -15301,5 +15327,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "فندق"
@@ -15308,15 +15334,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr "حرّر فندق"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr "النجوم"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr "فندق (رخيص)"
@@ -15324,20 +15350,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr "حرّر فندق (رخيص)"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr "بيت ضيافة"
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr "حرّر بيت ضيافة"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr "كوخ"
@@ -15345,10 +15371,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr "حرّر كوخ"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr "نزل"
@@ -15356,30 +15382,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr "حرّر نزل"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr "كوخ جبلي"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr "حرّر كوخ جبلي"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr "موقع قافلة"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr "حرّر موقع قافلة"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr "موقع تخييم"
@@ -15387,10 +15413,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr "حرّر موقع تخييم"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "طعام و شراب"
@@ -15401,5 +15427,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "مطعم"
@@ -15407,5 +15433,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr "حرّر مطعم"
@@ -15413,5 +15439,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr "الطبخ"
@@ -15419,61 +15445,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr "إيطالي"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr "صيني"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr "معجنات إيطالية (بيزا)"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr "هامبرغر"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr "يوناني"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr "ألماني"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr "هندي"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr "محلي/إقليمي"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr "كباب / شورما"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr "تركي"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr "آسيوي"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr "تايلاندي"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr "مكسيكي"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr "ياباني"
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr "وجبات سريعة"
@@ -15481,9 +15507,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr "حرّر مطعم وجبات السريعة"
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr "مقهى إستراحة"
@@ -15491,10 +15517,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr "حرّر مقهى إستراحة"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr "حانة"
@@ -15502,20 +15528,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr "حرّر حانة"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr "حانة شرب الجعة"
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr "حرّر حانة شرب الجعة"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr "حانة"
@@ -15523,10 +15549,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr "حرّر حانة"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr "نادي سهر / نادي ليلي"
@@ -15534,20 +15560,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr "حرّر نادي سهر/ نادي ليلي"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "سياحة"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr ""
@@ -15556,11 +15582,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr "أزقات الإفتتاح"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "متحف"
@@ -15568,10 +15594,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr "حرّر متحف"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "حديقة حيوانات"
@@ -15580,10 +15606,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr "حرّر حديقة حيوانات"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr "موقع كاشف"
@@ -15591,25 +15617,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr "برج مراقبة"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr "أعمال فنية"
@@ -15617,5 +15643,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr "حرّر أعمال فنية"
@@ -15623,5 +15649,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr "مكتب إستعلامات"
@@ -15629,80 +15655,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr "حرّر مكتب إستعلامات"
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "الخريطة"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr "نوع الخريطة"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr "خريطة"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr "خريطة المدينة"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr ""
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr "خريطة راكب دراجة"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
 msgid "Closer Description"
 msgstr ""
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1701
 msgid "Information Board"
 msgstr "لوحة معلومات"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Board Type"
 msgstr "نوع اللوحة"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "board"
 msgstr "اللوح"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "history"
 msgstr "التاريخ"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "nature"
 msgstr "الطبيعة"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "wildlife"
 msgstr "الحيوانات الضارة"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Guidepost (Hiking)"
 msgstr ""
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr "حرّر ملجأ"
@@ -15710,25 +15736,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr "موقع تنزه"
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr "حرّر موقع تنزه"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "مواقع تاريخية"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "قلعة"
@@ -15737,20 +15763,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr "حرّر قلعة"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "أطلال"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr "حرّر أطلال"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr "موقع أثري"
@@ -15759,10 +15785,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr "حرّر موقع أثري"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr "ساحة معركة"
@@ -15770,5 +15796,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr "حرّر ساحة معركة"
@@ -15776,15 +15802,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr "نصب تذكاري"
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr "حرّر نصب تذكاري"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr "نصب تذكاري"
@@ -15792,45 +15818,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr "حرّر نصب تذكاري"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr "ضريح/مزار"
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr "حرّر مزار/ضريح"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "وقت الفراغ"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr "حديقة ألعاب مائية"
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr "حرّر حديقة ألعاب مائية"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "ملعب"
@@ -15838,15 +15864,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr "حرّر ملعب"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "صيد السمك"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr "حرّر صيد السمك"
@@ -15854,15 +15880,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr "المرافق الرياضية"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "مدرج ألعاب رياضية"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr "حرّر مدرج ألعاب رياضية"
@@ -15876,6 +15902,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "إختر الرياضة :"
@@ -15898,4 +15924,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -15956,5 +15990,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -15964,5 +16006,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16108,5 +16150,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16212,5 +16254,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16251,29 +16293,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr "الرياضة"
@@ -16283,227 +16326,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr "متعدد"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr "أسلحة الرماية"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr "كرة القدم الأوسترالية"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr "كرة المضرب"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr "كرة السلّة"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr "التسلق"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr "ركوب الدراجة"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr "سبق الكلاب"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr "ركوب الخيل"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr "الجمباز"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr "سبق الخيل"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr "رياضة المحركات"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr "التزلج"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "كرة القدم"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr "السباحة"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "تنس الطاولة"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr "التنس"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr "مركز/نادي  رياضي"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr "حرّر مركز/نادي رياضي"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr ""
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr ""
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr "رياضة"
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr "متعدد"
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr ""
@@ -16542,191 +16585,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr "مركز/نادي رياضي"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr "مدرج ألعاب رياضية"
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr "سلاح الرامي"
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr "حرّر سلاح الرامي"
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr "تسلق"
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr "حرّر تسلق"
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr "غدف"
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr "حرّر غدف"
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr "ركب الدراجة"
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr "حرّر ركب الدراجة"
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr "سباق الكلاب"
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr "حرّر سباق الكلاب"
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr "فروسي"
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr "حرّر فروسي"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr "سباق الخيل"
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr "حرّر سباق الخيل"
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr "رياضة بدنية"
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr "حرّر رياضة بدنية"
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr "رياضة المحركات"
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr "حرّر رياضة المحركات"
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr "تزحلق"
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr "حرّر تزحلق"
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr "سباحة"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr "حرّر سباحة"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr "تزلّج"
@@ -16734,56 +16777,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr "حرّر تزلّج"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr "نزولاً"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr "شمالي"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr "الصعوبة"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr "مبتدئ"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr "سهل"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr "خبير"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr "رماية"
@@ -16791,178 +16834,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr "حرّر رماية"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr "رياضة (كرة)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr "كرة القدم"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr "حرّر كرة القدم"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr "كرة السلّة"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr "حرّر كرة السلّة"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr "تنس الطاولة"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr "حرّر تنس الطاولة"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr "تنس"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr "حرّر تنس"
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "مباني"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr "مبنى"
@@ -16970,5 +17013,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "مبنى عام"
@@ -16976,10 +17019,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr "حرّر مبنى عام"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "مبنى البلدية"
@@ -16987,10 +17030,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "حرّر مبنى البلدية"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "سفارة"
@@ -16998,10 +17041,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "حرّر سفارة"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "محكمة"
@@ -17010,10 +17053,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "حرّر محكمة"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "سجن"
@@ -17022,10 +17065,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "حرّر سجن"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "شرطة"
@@ -17035,10 +17078,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "حرّر شرطة"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "فوج إطفاء"
@@ -17047,10 +17090,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "حرّر فوج إطفاء"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "مكتب البريد"
@@ -17058,5 +17101,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr "حرّر مكتب البريد"
@@ -17064,15 +17107,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr "حضانة أطفال"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr "حرّر حضانة أطفال"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "مدرسة"
@@ -17080,10 +17123,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "حرّر مدرسة"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr "جامعة"
@@ -17091,10 +17134,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr "حرّر جامعة"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr "كلّية"
@@ -17102,5 +17145,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr "حرّر كلّية"
@@ -17108,5 +17151,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "سينما"
@@ -17115,10 +17158,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "حرّر سينما"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "مكتبة"
@@ -17127,10 +17170,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "حرّر مكتبة"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr "مركز ثقافي"
@@ -17138,10 +17181,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr "حرّر مركز ثقافي"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "مسرح"
@@ -17150,10 +17193,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "حرّر مسرح"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr "معبد"
@@ -17163,5 +17206,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr "حرّر معبد"
@@ -17170,6 +17213,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr "الديانة"
@@ -17178,66 +17221,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr "بهائي"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr "بوذي"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr "نصراني"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr "هندوس"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr "يهودي"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr "مسلم"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr "سيخ"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr "روحاني"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr "الطقوس الدينية"
@@ -17246,81 +17289,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr "معمداني"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr "كثليك"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr "إنجيلي"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr "شهود يهوه"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr "لوثري"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr "منهجي"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr "أرثدكس"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr "بروتستاني"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr "شيعي"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr "سنّي"
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr "عناوين"
@@ -17329,5 +17372,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr "حرّر معلومات عنوان"
@@ -17335,5 +17378,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr "رقم المنزل"
@@ -17341,20 +17384,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr "تسمية المنزل"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr "إسم المدينة"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "الرمز البريدي"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr "رمز البلد"
@@ -17362,5 +17405,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr "إستيفاء العنوان"
@@ -17369,5 +17412,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr "حرّر إستيفاء العنوان"
@@ -17375,71 +17418,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr "مخطط الترقيم"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr "مفرد"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr "مثنى"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr "الكلّ"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr "من صنع الإنسان"
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr "المصانع"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr "حرّر المصانع"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "برج"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "حرّر برج"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "خزان / برج مياه"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "حرّر خزان/برج مياه"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr "خزان محروقات"
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr "حرّر خزان المحروقات"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "منارة"
@@ -17447,10 +17490,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "حرّر منارة"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "طاحونة هوائية"
@@ -17458,10 +17501,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "حرّر طاحونة هوائية"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "خط أنابيب"
@@ -17469,10 +17512,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "حرّر خط أنابيب"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr "محطّة تكرير مياه"
@@ -17482,10 +17525,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr "حرّر محطّة تكرير مياه"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr "ونش"
@@ -17493,10 +17536,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr "حرّر ونش"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr "عمود إضائة"
@@ -17504,10 +17547,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr "حرّر عمود إضاءة"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr "نقطة رؤية"
@@ -17515,10 +17558,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr "حرّر نقطة رؤية"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr "مراقبة"
@@ -17526,5 +17569,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr "حرّر كامرة مراقبة"
@@ -17532,5 +17575,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr "مولد طاقة"
@@ -17540,39 +17583,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr "حرّر مولد طاقة"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr "أرياح"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr "مائية"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr "طاقة أحفورية"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr "نووية"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr "فحم"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr "كهرباء شمسية"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr "غاز"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr "محطة توليد طاقة"
@@ -17581,10 +17624,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr "حرّر محطة توليد طاقة"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr "محطة طاقة فرعية"
@@ -17593,5 +17636,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr "حرّر محطة طاقة فرعية"
@@ -17599,10 +17642,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr "رقم الخط"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr "عمود كهربائي"
@@ -17613,5 +17656,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr "حرّر عمود كهربائي"
@@ -17619,5 +17662,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr "سلك/خط كهربائي"
@@ -17626,25 +17669,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr "حرّر عمود كهربائي"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr "التوتر"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr "عدد الأسلاك"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr "خدمات/نافعات"
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "مراحيض"
@@ -17652,20 +17695,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr "الرقم المرجعي"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr "الملاحظة"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr "صندوق بريد"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "هاتف"
@@ -17674,5 +17717,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr "حرّر هاتف"
@@ -17680,5 +17723,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "عملات معدنية"
@@ -17686,5 +17729,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr "الملاحظات"
@@ -17692,5 +17735,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -17698,5 +17741,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr ""
@@ -17704,15 +17747,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "بطاقات إعتماد"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "بطاقات هاتفية"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr "إعادة تصنيع الأشياء"
@@ -17721,5 +17764,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr "حرّر إعادة تصنيع الأشياء"
@@ -17727,35 +17770,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr "بطاريات"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr "علب (معدنية)"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr "ملابس"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr "زجاج"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr "ورق"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr ""
@@ -17764,20 +17807,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr "مخبئ"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr ""
@@ -17785,22 +17828,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr "الإرتفاع"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr "منخفض"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr "نصف"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr "ملء"
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr "نافورة"
@@ -17809,10 +17852,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr "حرّر نافورة"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "ماء شفة"
@@ -17821,10 +17864,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "حرّر ماء شفة"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr ""
@@ -17832,25 +17875,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "مَتاجر/دكاكين"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr "سوبرماركت"
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr "حرّر سوبرماركت"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr ""
@@ -17858,10 +17901,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr ""
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr "كشك"
@@ -17869,10 +17912,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr "حرّر كشك"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "آلة بيع"
@@ -17880,5 +17923,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr ""
@@ -17886,88 +17929,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "نوعية المبيعات"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr "تذاكر_النقل_العام"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr "خرائط_النقل_العام"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr "تذاكر_موقف_سيارات"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr "مأكولات"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "مشروبات"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr "حلويات"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr "سجائر"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr "صور"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr "مأكولات للحيوانات"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "جرائد"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "ألعاب"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr "طوابع"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "رقائق SIM"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr "قسائم تعبئة هاتفية"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr "قسائم"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr "مانع الحمل"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr "سدادات قطنية"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "جزار"
@@ -17975,10 +18018,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "حرّر جزار"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "خباز"
@@ -17986,10 +18029,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "حرّر خباز"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr "بائع الزهور"
@@ -17997,20 +18040,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr "حرّر بائع الزهور"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr "مأكولات عضوية"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr "حرّر مبيع مأكولات عضوية"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr ""
@@ -18018,60 +18061,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr ""
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr "مشروبات"
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr ""
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr "حاسوب"
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr "حرّر مبيع قطع حاسوب"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr "إلكترونيات"
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr "حرّر إلكترونيات"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr "حرّر مبيع Hifi"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr "أثاث/فرش"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr "حرّر مبيع فرش/أثاث"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr ""
@@ -18079,10 +18122,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr "خردوات/أدوات منزلية"
@@ -18090,10 +18133,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr "حرّر مخزن خردوات/أدوات منزلية"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -18101,60 +18144,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr "قرطاسية"
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr "حرّر مبيع قرطاسية"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr "حلاق"
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr "حرّر حلاق"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr "أحذية"
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr "حرّر أحذية"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr "ألعاب"
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr "حرّر مبيع ألعاب"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr "مرئيّات"
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr "حرّر مبيع مرئيّات"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "تنظيف جاف"
@@ -18162,10 +18205,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "حرّر تنظيف جاف"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "مصبغة/غسيل"
@@ -18173,10 +18216,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "حرّر مصبغة/غسيل"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr "نشاطات في الخلاء"
@@ -18184,35 +18227,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr "حرّر متجر نشاطات في الخلاء"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr "حرّرمبيع  لوازم للأنشطة رياضية"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr "حرّر نظاراتي"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "نقود/أموال"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "مصرف"
@@ -18220,5 +18263,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "حرّر مصرف"
@@ -18226,10 +18269,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "صرّاف آلي"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr "صرّاف"
@@ -18237,5 +18280,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr "حرّر صرّاف"
@@ -18243,15 +18286,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "حرّر صراف آلي"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "صحة"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr "أطباء"
@@ -18259,20 +18302,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr "حرّر أطباء"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr "طبيب أسنان"
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr "حرّر طبيب أسنان"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "صيدلية"
@@ -18280,5 +18323,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "حرّر صيدلية"
@@ -18286,10 +18329,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "مستشفى"
@@ -18297,10 +18340,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "حرّر مستشفى"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr "نقطة دخول طوارئ"
@@ -18309,5 +18352,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr "حرّر نقطة دخول طوارئ"
@@ -18316,20 +18359,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr "رقم النقطة"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr "إسم النقطة"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr "رقم الهاتف"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr "إستعمل رمز دولي مثل 12-345-67890"
@@ -18337,5 +18380,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr "بيطري"
@@ -18344,56 +18387,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr "حرّر بيطري"
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr "قارة"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr "حرّر قارة"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr "وطن"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr "حرّر وطن"
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr "دولة/ولاية"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr "حرّر دولة/ولاية"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr "قطر/منطقة"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr "حرّر قطر/منطقة"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr ""
@@ -18401,15 +18443,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr "مدينة"
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr "حرّر مدينة"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr "بلدة"
@@ -18417,10 +18459,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr "حرّر بلدة"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr "ضاحية"
@@ -18428,25 +18470,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr "حرّر ضاحية"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "قرية"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "حرّر قرية"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr "قرية صغيرة"
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr "حرّر قرية صغيرة"
@@ -18454,5 +18496,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr "محلة"
@@ -18460,10 +18502,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr "حرّر محلة"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "جزيرة"
@@ -18471,5 +18513,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "حرّر جزيرة"
@@ -18477,5 +18519,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr "مدخل كهف"
@@ -18483,10 +18525,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr "حرّر مدخل كهف"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "قمّة"
@@ -18494,10 +18536,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "حرّر قمّة"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr "جليد"
@@ -18505,10 +18547,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr "حرّر جليد"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr "بركان"
@@ -18516,70 +18558,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr "حرّر بركان"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr "الحدود"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr "دولية"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr "حرّر حدود دولية"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr "إدارية"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr "حرّر حدود إدارية"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr "مدنية"
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr "حرّر حدود إدارية"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr "حرّر الحدود السياسية"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr "محمية وطنية (بيئية)"
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr "حرّر محمية وطنية (التنوع البيئي)"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr "إستعمال الأرض"
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "شجرة"
@@ -18588,15 +18630,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "حرّر شجرة"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr "حرّر اإسم النباتي"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr "حرج"
@@ -18605,5 +18647,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr "حرّر حرج"
@@ -18611,17 +18653,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr "صنوبري الثمر"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr "مختلط"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "غابة"
@@ -18630,14 +18672,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr "حرّر غابة"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr "محمية طبيعية"
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr "حرّر محمية طبيعية"
@@ -18645,25 +18687,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr "حصاة"
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr "حرّر حصاة"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr "أشجار منخفضة"
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr "حرّر أشجار منخفضة"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr ""
@@ -18671,10 +18713,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr "هوّة"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr ""
@@ -18682,5 +18724,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr "حرّر أرض بور"
@@ -18688,5 +18730,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr "فناء مزرعة"
@@ -18695,45 +18737,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr "حرّر فناء مزرعة"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr "أرض زراعية"
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr "حرّر أرض زراعية"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr "مرج"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr "حرّر مرج"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr "كرم عنب"
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr "حرّر كرم عنب"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr "حصص سكنية"
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr "حرّر حصص سكنية"
@@ -18741,25 +18783,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr "حديقة"
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr "حرّر حديقة"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr "عشب"
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr ""
@@ -18767,10 +18809,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr "شائع"
@@ -18778,20 +18820,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr "حرّر شائع"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr "متنزه"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr "حرّر متنزه"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr "ميدان ألعاب"
@@ -18799,5 +18841,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr "حرّر ميدان ألعاب"
@@ -18805,15 +18847,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr "منطقة سكنية"
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr "حرّر منطقة سكنية"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr "مقبرة"
@@ -18821,9 +18863,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr "حرّر مقبرة"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr "مقبرة"
@@ -18831,39 +18873,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr "حرّر إستعمال الأرض كمقبرة"
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr "بيع بلمفرق"
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr "حرّر بيع بلمفرق"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr "تجاري"
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr "حرّر إستعمال تجاري للأرض"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr "صناعي"
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr "حرّر الإستعمال الصناعي"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr "أرض سكة حديد"
@@ -18871,15 +18913,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr "حرّر أرض سكة حديد"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr "عسكري"
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr "حرّر الإستخدام العسكري للأرض"
@@ -18887,55 +18929,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr "موقع ورشة إعمار"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr "حرّر موقع ورشة إعمار"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr "حقل أخضر"
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr "حرّر إستعمال الأرض كحقل أخضر"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr "مطمر نفايات"
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr "حرّر مطمر نفايات"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr "كسّارة، مقلع حجارة"
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr "حرّر كسّارة / مقلع حجارة"
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr "متعدد الضلوع"
@@ -18945,5 +18987,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr "حرّر متعدد الضلوع"
@@ -18952,10 +18994,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr "الفلق الخارجي"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr "حرّر الفلق الخارجي"
@@ -18963,5 +19005,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr "حصر الإنعطاف"
@@ -18970,5 +19012,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr "حرّر حصر الإنعطاف"
@@ -18976,34 +19018,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr "حصر"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr "إنعطاف_يسار_ممنوع"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr "إنعطاف_يمين_ممنوع"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr "على_الطول_ممنوع"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr "رجوع_ممنوع"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr "إنعطاف_يميني_فقط"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr "إنعطاف_يسار_ممنوع"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr "على_الطول_فقط"
@@ -19012,15 +19054,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr "من الطريق"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr "مروراً بلعقدة أو الطريق"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr "إلى الطريق"
@@ -19028,5 +19070,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr "الطريق"
@@ -19035,5 +19077,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr "حرّر طريق"
@@ -19041,5 +19083,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr "نوع الطريق"
@@ -19111,24 +19153,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr "حافلة (باص)"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr "الطريق"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr "عبارة بحرية"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr ""
@@ -19181,20 +19223,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr "ترام"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr ""
@@ -19208,10 +19250,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr "وصف الرمز"
@@ -19219,26 +19261,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr "الشبكة"
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "نوع الطريق"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr "المقترح"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr "البديل"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr "المؤقت"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr "الإتصال"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr "اللون (hex)"
@@ -19247,30 +19295,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr "فلق الطريق"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr "الفلق الأمامي"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr "الفلق الخلفي"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr "نقطة التوقف"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr "نقطة التوقف الأمامية"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr "نقطة التوقف الخلفية"
@@ -19306,6 +19354,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19321,5 +19370,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19338,5 +19395,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr ""
@@ -19430,7 +19487,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr "جسر"
@@ -19695,15 +19752,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr "مهجور"
@@ -19745,5 +19802,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr "خيل"
@@ -19881,4 +19938,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19890,5 +19953,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19896,5 +19959,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19931,5 +19994,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19953,11 +20016,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr ""
@@ -19981,5 +20044,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20020,5 +20083,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20056,6 +20119,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr "شارع"
@@ -20111,7 +20174,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr ""
@@ -20164,11 +20227,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr "سكة حديد"
@@ -20189,5 +20260,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr ""
@@ -20201,5 +20272,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr ""
@@ -20220,5 +20291,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr "مستديرة دوران"
@@ -20232,6 +20303,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr ""
@@ -20246,5 +20317,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr "شاطئ نهر"
@@ -20258,5 +20329,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr "جدول نهر"
@@ -20270,5 +20341,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr "حوض سفن"
@@ -20296,5 +20367,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr "قنة جر"
@@ -20437,5 +20508,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20462,13 +20533,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr "من صنع الإنسان"
@@ -20530,7 +20601,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr ""
@@ -20553,10 +20624,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr ""
@@ -20592,7 +20663,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr "سكة حديد قديمة"
@@ -20637,6 +20708,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr ""
@@ -20650,5 +20721,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr ""
@@ -20670,5 +20741,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr ""
@@ -20682,5 +20753,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr ""
@@ -20688,4 +20759,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20728,7 +20806,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr "خط جوي"
@@ -20745,5 +20823,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr ""
@@ -20758,5 +20836,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr ""
@@ -20771,5 +20849,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr ""
@@ -20784,5 +20862,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr ""
@@ -20797,5 +20875,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr ""
@@ -20810,5 +20888,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr ""
@@ -20831,4 +20909,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -20839,4 +20924,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -20913,10 +21006,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr "طاقة"
@@ -20930,5 +21024,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr "رصيف ميناء"
@@ -20942,5 +21036,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr "خط أنابيب"
@@ -21068,12 +21162,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr "وقت الفراغ"
@@ -21087,5 +21181,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr "مارينا"
@@ -21157,8 +21251,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr ""
@@ -21260,10 +21354,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr ""
@@ -21283,4 +21377,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21302,4 +21403,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21623,4 +21731,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -21647,24 +21763,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr ""
@@ -21696,6 +21820,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr ""
@@ -21756,8 +21880,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr "صحة"
@@ -22110,26 +22234,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr "متجر/دكان"
@@ -22184,5 +22308,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22201,8 +22325,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr "فندق"
@@ -22352,9 +22476,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr "سياحة"
@@ -22426,8 +22550,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr "تاريخي"
@@ -22498,8 +22622,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr "خضار"
@@ -22513,5 +22637,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr "كسارة / مقلع حجارة"
@@ -22525,5 +22649,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr ""
@@ -22545,5 +22669,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr "حوض"
@@ -22557,5 +22681,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr "غابة"
@@ -22569,5 +22693,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr "فناء مزرعة"
@@ -22590,5 +22714,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr "بيع بلمفرق"
@@ -22602,5 +22726,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr "صناعي"
@@ -22614,5 +22738,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr ""
@@ -22626,5 +22750,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr "حقل خضار"
@@ -22638,5 +22762,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr ""
@@ -22693,7 +22817,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr "عسكري"
@@ -22707,5 +22831,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr "مقبرة/جبانة"
@@ -22718,5 +22842,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr "قمّة"
@@ -22731,5 +22855,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr "نهر الجليد"
@@ -22743,5 +22867,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr "بركان"
@@ -22796,8 +22920,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr "طبيعي"
@@ -22811,5 +22935,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr "أشجار منخفضة"
@@ -22823,5 +22947,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr "أرض بور"
@@ -22835,5 +22959,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr "غابة/حرش"
@@ -22847,5 +22971,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr "طين"
@@ -22859,5 +22983,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr "شاطئ"
@@ -22935,8 +23059,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr "طريق"
@@ -22984,7 +23108,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr "الحدود"
@@ -23126,10 +23250,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr "المكان"
@@ -23177,6 +23301,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr "العنوان"
@@ -23473,30 +23597,30 @@
 msgstr ""
 
+#~ msgid "Aborting..."
+#~ msgstr "إجهاض..."
+
+#~ msgid "false"
+#~ msgstr "خاطئ"
+
+#~ msgid "true"
+#~ msgstr "حقيقي"
+
+#~ msgid "different"
+#~ msgstr "مختلف"
+
+#~ msgid "Rotate"
+#~ msgstr "أدر"
+
+#~ msgid "Change"
+#~ msgstr "غيّر"
+
+#~ msgid "Move"
+#~ msgstr "حرك"
+
+#~ msgid "unnamed"
+#~ msgstr "غيرمسمى"
+
 #~ msgid "Unknown file extension."
 #~ msgstr "إمتداد ملف غير معروف."
-
-#~ msgid "Move"
-#~ msgstr "حرك"
-
-#~ msgid "Aborting..."
-#~ msgstr "إجهاض..."
-
-#~ msgid "false"
-#~ msgstr "خاطئ"
-
-#~ msgid "true"
-#~ msgstr "حقيقي"
-
-#~ msgid "different"
-#~ msgstr "مختلف"
-
-#~ msgid "Rotate"
-#~ msgstr "أدر"
-
-#~ msgid "Change"
-#~ msgstr "غيّر"
-
-#~ msgid "unnamed"
-#~ msgstr "غيرمسمى"
 
 #~ msgid "Email"
Index: /applications/editors/josm/i18n/po/bg.po
===================================================================
--- /applications/editors/josm/i18n/po/bg.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/bg.po	(revision 17069)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
-"PO-Revision-Date: 2009-08-04 11:53+0000\n"
-"Last-Translator: pl71 <Unknown>\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
+"PO-Revision-Date: 2009-08-14 13:30+0000\n"
+"Last-Translator: Anton Todorov <Unknown>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-10 11:56+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -57,6 +57,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -66,5 +66,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -101,6 +101,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "Грешка"
@@ -111,5 +111,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "Незаписани промени"
@@ -129,10 +129,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -149,15 +149,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -187,6 +187,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -216,5 +216,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -375,5 +375,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
 msgstr "Обединение"
@@ -385,4 +385,6 @@
 "</html>"
 msgstr ""
+"<html>Няма слоеве към които слоя източник<br>''{0}''.<br>би могъл да се "
+"обедини.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
@@ -457,9 +459,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -492,7 +494,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -579,37 +581,37 @@
 msgstr "{0} брой точки в линия {1} - превишават допустимия брой точки {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "данни"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "слой"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "избор"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "конфликт"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "свалено"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Показване на {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Промяна на мащаба за да може да се види {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -619,30 +621,30 @@
 msgstr "Изглед: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "Няма нищо избрано за показване."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "Няма конфликти за показване."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "Обедини линии"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "Обединява няколко отделни линии в една."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "Моля, изберете поне две линии за комбиниране."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr "Обединяване на линии, влизащи в различни релации?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -652,13 +654,13 @@
 "ги обеденим?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "Комбиниране въпреки всичко"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "Промени посоката?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -668,10 +670,10 @@
 "посоката на някои от тях?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "Връщане и Комбиниране"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -679,20 +681,20 @@
 msgstr "Въведете стойности за всички конфликти."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Разрешаване на конфликти"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Обединяване {0} линии"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "Всички линии бяха празни"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -739,6 +741,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -760,6 +762,6 @@
 msgstr "Изтриване на избраните обекти."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -769,5 +771,5 @@
 msgstr "Презаписване"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -901,7 +903,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "Експорт на данните до GPX файл."
+msgstr "Експорт в GPX файл"
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -917,5 +918,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -933,5 +934,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -1007,22 +1008,22 @@
 msgstr "Обединява текущия слой в друг слой"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "Обедини точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "Обедини точките в най-старата от тях."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "Моля, изберете поне две точки за обединение."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr "Обединяване точки от различни релации?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1032,9 +1033,9 @@
 "обедините?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "Сливане въпреки всичко"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -1042,5 +1043,5 @@
 "използва."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1297,7 +1298,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "Не са открити пресичания. Нищо не е променяно."
+msgstr "Не е намерен експортер! Нищо не е записано."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1622,5 +1622,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
 msgid "Didn't find a primitive with id {0} in the current dataset"
-msgstr ""
+msgstr "Не е намерен примитив с id {0} в текущия набор от данни"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
@@ -1722,5 +1722,5 @@
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr ""
+msgstr "<html>Качването <strong>не стана</strong>.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389
@@ -1734,5 +1734,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
 msgid "upload all changes in one request"
-msgstr ""
+msgstr "качва всички промени в една заявка"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -1741,4 +1741,6 @@
 "changed primitive"
 msgstr ""
+"Активирай за качване на всички промени в една заявка, Изключи за използване "
+"на заявка за всяка променена примитива"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464
@@ -1875,4 +1877,5 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr ""
+"Игнориране на грешката защото свалянето беше отказано. Грешката бе: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
@@ -1891,10 +1894,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
 msgid "Updating data"
-msgstr ""
+msgstr "Актуализиране на данните"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
 #, java-format
 msgid "The following errors occurred during mass download:{0}"
-msgstr ""
+msgstr "Следните грешки се получиха по време на масовото сваляне:{0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
@@ -1902,5 +1905,5 @@
 msgstr "Грешки при Сваляне"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1912,5 +1915,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr "Изтрити или преместени примитиви"
@@ -1950,11 +1953,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2096,5 +2099,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2175,5 +2178,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Търсене на обекти."
@@ -2181,5 +2184,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
-msgstr ""
+msgstr "Не може да се търси защото няма заредени данни"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66
@@ -2221,5 +2224,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-msgstr ""
+msgstr "<b>type=route</b> - ключ 'type' със стойност именно 'route'."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
@@ -2301,5 +2304,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Търсене"
@@ -2503,5 +2506,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2510,5 +2513,5 @@
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
-msgstr ""
+msgstr "Решаване конфлики на координати в {0}"
 
 #. should not happen
@@ -2545,5 +2548,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr "Изтриване от релация"
@@ -2577,5 +2580,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr ""
+msgstr "Потвърждение за изтриване"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2585,9 +2588,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "Обедини {0} точки"
-msgstr[1] "Обедини {0} точки"
+msgstr[0] "Преместване {0} възел"
+msgstr[1] "Преместване {0} възела"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2623,9 +2626,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "{0} точка"
-msgstr[1] "{0} точки"
+msgstr[0] "Завърти {0} възел"
+msgstr[1] "Завърти {0} възела"
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2762,5 +2765,5 @@
 #, java-format
 msgid "already registered a conflict for primitive ''{0}''"
-msgstr ""
+msgstr "вече регистриран конфликт за примитив ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
@@ -2789,7 +2792,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "Промени {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2799,5 +2802,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2844,5 +2847,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2875,5 +2878,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2887,5 +2890,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "железопътна линия"
@@ -2900,5 +2903,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -2923,9 +2926,9 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179
 msgid "no earliest version found. History is empty."
-msgstr ""
+msgstr "няма намерена по-ранна версия. Историята е празна."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185
 msgid "no latest version found. History is empty."
-msgstr ""
+msgstr "няма намерена последна версия. Историята е празна."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
@@ -2941,5 +2944,5 @@
 #, java-format
 msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr ""
+msgstr "параметъра се очаква да е ''{0}'' > 0 , получено ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
@@ -3183,5 +3186,5 @@
 msgstr "Да не се показва повече"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3192,5 +3195,5 @@
 "Проверете URL на сървъра в настройките и Вашата интернет връзка."
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3200,10 +3203,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr "Нарушение на предварителното състояние"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3211,25 +3214,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "неизвестно"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3239,9 +3242,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3250,9 +3253,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "Неочаквана грешка"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3262,9 +3277,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "Неизвестен хост"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3277,5 +3292,5 @@
 "за грешка е:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr "Примитивът вече е изтрит."
@@ -3365,10 +3380,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "Потребителско име"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "Парола"
@@ -3572,15 +3587,15 @@
 msgstr "(няма обект)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "слоя не е в списъка."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+msgstr "Слоя ''{0}'' трябва да бъде в списъка от слоеве"
+
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3635,34 +3650,34 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
-msgstr ""
+msgstr "Моя с Тяхния"
 
 #. *
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
-msgstr ""
+msgstr "Моя с Обедининия"
 
 #. *
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+msgstr "Тчхния с Обединения"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr "роля {0} не участва в двойката за сравнение {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+msgstr "Настройки"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3672,13 +3687,13 @@
 msgstr "Маркери"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+msgstr "Възли"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3686,40 +3701,40 @@
 msgstr "Членове"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+msgstr "Няма чакащи tag конфликти за разрешаване"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+msgstr "Tags({0} конфликти)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+msgstr "{0} чакащи tag конфликти за разрешаване"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+msgstr "Възли(решени)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+msgstr "Възли(с конфликт)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3727,74 +3742,74 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr "списъкът в роля {0} понастоящем не участва в двойка за сравнение"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3802,30 +3817,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3833,5 +3848,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3839,13 +3854,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3853,5 +3868,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3859,21 +3874,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3882,27 +3897,27 @@
 msgstr "Премахни"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3910,5 +3925,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3917,5 +3932,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3924,5 +3939,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3931,5 +3946,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -3938,21 +3953,21 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -3962,5 +3977,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -3970,5 +3985,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -3976,19 +3991,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -3997,19 +4012,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr "Да, възстанови от изтриване също"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr "Не, отказване на операцията"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -4020,9 +4035,9 @@
 "сървъра.<br><br>Желаете ли да възстановим и тези възли също?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr "Възстановяване на изтрити допълнителни възли?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -4034,13 +4049,13 @@
 "изтрити на сървъра.<br><br>Желаете ли да ги възстановим и тях също?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr "Възстановяване след изтриване на свързани примитиви?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -4048,90 +4063,90 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr "(никой)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "изтрито"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4141,17 +4156,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4160,14 +4175,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4175,21 +4190,21 @@
 msgstr "Роля"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4197,14 +4212,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4212,7 +4227,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4224,7 +4239,7 @@
 msgstr "Ключ"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4237,45 +4252,45 @@
 msgstr "Стойност"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr ""
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4295,8 +4310,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4333,5 +4348,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4433,83 +4448,83 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "Слоеве"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "Отваряне списъка с всички заредени слоеве."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "Изтриване избрания слой."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr "Изтриване на слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "Показване/скриване"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "Превключване видимостта на избрания слой."
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "Преместване избрания слой един ред нагоре."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "Преместване избрания слой един ред надолу."
@@ -4519,6 +4534,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4527,22 +4542,22 @@
 msgstr[1] "Това ще промени до {0} обекта"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "Празна стойност изтрива ключа."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<различни>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "Промени стойностите?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4550,5 +4565,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4557,40 +4572,40 @@
 msgstr[1] "Промяна параметрите на {0} обекта"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "Моля, изберете ключ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "Изберете стойност"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 msgid "Please select the objects you want to change properties for."
 msgstr "Моля, изберете обектите, чиито параметри искате да промените."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "Параметри/Отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "Параметри на избраните обекти"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "Член на"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "Добавяне на параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4607,39 +4622,39 @@
 msgstr "Добави"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 msgid "Add a new key/value pair to all objects"
 msgstr "Добавяне на нова двойка ключ/стойност за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "Редактиране на параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 msgid "Edit the value of the selected key for all objects"
 msgstr "Редактиране стойността на избрания ключ за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Свойства: {0} / Членство: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "Параметри / Отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "Промени релация"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Изваждане на избраните обекти от релация {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "Изтриване на избрания ключ за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "Изтриване на параметри"
@@ -4651,5 +4666,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "Релации"
@@ -4681,31 +4696,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "Текуща селекция"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "Отваряне на списък с избрани обекти."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "Мащабирай до избрания(те) елемент(и)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "Обнови списъка с избраните."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "Мащабиране по селекцията"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Избр.: Рел.:{0} / Пътища:{1} / Възли:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4713,5 +4728,5 @@
 msgstr "Избор"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4720,5 +4735,5 @@
 msgstr[1] "{0} пътя"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4727,5 +4742,5 @@
 msgstr[1] "{0} релации"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -4937,7 +4952,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "Изтриване на избраната релация"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -5020,5 +5034,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5261,5 +5275,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "Места"
@@ -5306,21 +5320,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "тип"
@@ -6120,72 +6134,515 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "Име"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr "Изображения за {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr "Прочитане GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Не е указано време за точка {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Невъзможно да се прочете времето \"{0}\" от точка {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr "Не е намерено изображение с информация за времето."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "Четене {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr "Изображения с данни за местоположение"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS Начало: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS Край: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr "текуща разлика: {0} с."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr "разлика в часови пояси: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "изображение"
+msgstr[1] "изображения"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} в пределите на следата"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "Синхронизация часовник"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "Изображения JPEG (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Невъзможно е да се прочете датата от файла \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Липсва EXIF време във файла \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "Изображение"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Въведете указаната дата (мм/дд/гггг ЧЧ:ММ:СС)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr "Часова зона на GPS устойството (разлика със снимките)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr "Синхронизиране времето с GPS приемника"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr "Въведенето време не може да бъде използвано."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr "GPS точка"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "Настройка рисуването на линии"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr "Използвай глобалните настройки."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr "Чертай линии между точките на този слой."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr "Не чертай линии между точките на този слой."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr "Избиране варианти за чертане на линиите."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "Избор цвят"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "По подразбиране"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Изберете цвят"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr "Маркери от наименувани точки."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Наименувани точки от следа от {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "Импорт Аудио"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave аудио файлове (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Аудио маркери от {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "Импорт на изображения"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} следа, "
+msgstr[1] "{0} следи, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} маршрут, "
+msgstr[1] "{0} маршрути, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} точка на интерес"
+msgstr[1] "{0} точки на интерес"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr "Название: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr "Описание: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr "Времеви интервал: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr "Дължина: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "Преобразувай в слой данни"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+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>Ако искате да качвате следи, погледнете тук:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Преобразувано от: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr "Свали от OSM по дължина на тази следа"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr "Свали всичко в пределите на:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr "{0} метри"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr "Максимална област за една заявка:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} кв. км."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Това действие ще изисква {0} отделни<br>заявки за сваляне. "
+"Продължаване?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr "Няма GPX следа в слоя за да асоциираме звук с нея."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"Някои пътни точки, които са с време преди началото или след края на следата, "
+"са пропуснати или преместени в началото."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Точките, които бяха прекалено далеч от останалите от следата, за да може "
+"смислено да се предположи тяхното време, бяха пропуснати."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Слой Данни {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr "извън областта за сваляне"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr "версия {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} се състои от:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} изтрити.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr "неустановена"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr "API версия: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr "Преобразувай в слой GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6194,7 +6651,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6204,448 +6661,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "Име"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr "Изображения за {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr "Прочитане GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Не е указано време за точка {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Невъзможно да се прочете времето \"{0}\" от точка {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr "Не е намерено изображение с информация за времето."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Четене {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr "Изображения с данни за местоположение"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS Начало: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS Край: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr "текуща разлика: {0} с."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr "разлика в часови пояси: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "изображение"
-msgstr[1] "изображения"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} в пределите на следата"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "Синхронизация часовник"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "Изображения JPEG (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Невъзможно е да се прочете датата от файла \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Липсва EXIF време във файла \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "Изображение"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Въведете указаната дата (мм/дд/гггг ЧЧ:ММ:СС)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr "Часова зона на GPS устойството (разлика със снимките)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr "Синхронизиране времето с GPS приемника"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr "Въведенето време не може да бъде използвано."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr "GPS точка"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "Настройка рисуването на линии"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "Използвай глобалните настройки."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr "Чертай линии между точките на този слой."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr "Не чертай линии между точките на този слой."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr "Избиране варианти за чертане на линиите."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "Избор цвят"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "По подразбиране"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Изберете цвят"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr "Маркери от наименувани точки."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Наименувани точки от следа от {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "Импорт Аудио"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave аудио файлове (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Аудио маркери от {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "Импорт на изображения"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} следа, "
-msgstr[1] "{0} следи, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} маршрут, "
-msgstr[1] "{0} маршрути, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} точка на интерес"
-msgstr[1] "{0} точки на интерес"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr "Название: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr "Описание: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr "Времеви интервал: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr "Дължина: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "Преобразувай в слой данни"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-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>Ако искате да качвате следи, погледнете тук:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Преобразувано от: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr "Свали от OSM по дължина на тази следа"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr "Свали всичко в пределите на:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr "{0} метри"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr "Максимална област за една заявка:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} кв. км."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Това действие ще изисква {0} отделни<br>заявки за сваляне. "
-"Продължаване?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr "Няма GPX следа в слоя за да асоциираме звук с нея."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-"Някои пътни точки, които са с време преди началото или след края на следата, "
-"са пропуснати или преместени в началото."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Точките, които бяха прекалено далеч от останалите от следата, за да може "
-"смислено да се предположи тяхното време, бяха пропуснати."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Слой Данни {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr "извън областта за сваляне"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr "версия {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} се състои от:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} изтрити.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr "неустановена"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr "API версия: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr "Преобразувай в слой GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -7042,5 +7056,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "Автомобил"
@@ -7057,16 +7071,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "Вело"
@@ -7094,14 +7110,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "Пеш"
@@ -7324,19 +7343,19 @@
 msgstr "Език"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr "Използване на вградените настройки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr ""
@@ -7466,37 +7485,11 @@
 msgstr "Парола"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Основен URL адрес на OSM сървъра (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Парола за OSM акаунт. Оставете празно за да не запомня програмата вашата "
-"парола."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "Основен URL адрес на сървъра"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "OSM парола"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -7873,7 +7866,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "Не може да се прочете \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -7978,7 +7971,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "Неизвестна роля ''{0}''."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8138,23 +8131,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "Грешна парола или потребителско име."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Внимание: Паролата ще бъде предадена нешифрирана."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "Съхрани потребителското име и паролата (нешифрирано)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "Въведете парола"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
 msgstr "Вход"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr ""
+"Парола за OSM акаунт. Оставете празно за да не запомня програмата вашата "
+"парола."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "OSM парола"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -8164,7 +8183,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-msgstr "очакваше се OsmDataLayer или GpxLayer. Имаме ''{0}''."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -8317,14 +8336,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "Неизвестен тип членство за ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "Подготовка на OSM данните..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr "Неправилен код на точка"
@@ -8786,5 +8805,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr "Описание"
@@ -9200,5 +9219,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr "Грешка при зареждане на файла"
@@ -9450,5 +9469,4 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
-#, fuzzy
 msgid ""
 "To enable the cadastre WMS plugin, change\n"
@@ -9456,6 +9474,4 @@
 "projection and retry"
 msgstr ""
-"За да включите кадастровия WMS plugin, променете\n"
-"проекцията на JOSM до Ламбертова и рестартирайте"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9548,5 +9564,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -10087,7 +10103,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr "вода"
@@ -10273,7 +10289,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "име"
+msgstr ""
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10843,12 +10858,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "начало"
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0} точка"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -10990,5 +11005,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr "Име на улица"
@@ -11828,7 +11843,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr "сграда"
@@ -11842,5 +11857,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr "област"
@@ -12075,17 +12090,14 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "Моля, изберете ред за редактиране"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "Изтриване на слой"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Start adjusting"
-msgstr "Започни маршрутизиране"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
@@ -12094,7 +12106,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "Няма промени за качване."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -12107,19 +12118,19 @@
 "Това може да доведе до погрешни координати."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr "Автоматично сваляне"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS слой ({0}), автоматично сваляне в мащаб {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS слой ({0}), сваляне в мащаб {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -12128,42 +12139,42 @@
 "разделителната способност."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr "Сваляне на видимите квадранти"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr "Смяна разделителна способност"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr "Презареждане грешни квадранти"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr "Алфа канал"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr "Запис на WMS слоя във файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr "Зареждане на WMS слой от файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Неподдъжана WMS файлова версия; намерена {0}, очаквана {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr "Грешка във формата на файла"
@@ -12534,4 +12545,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12568,5 +12581,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr "Пътна Мрежа"
@@ -12577,5 +12590,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Автомагистрала"
@@ -12584,5 +12597,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr "Редактиране автомагистрала"
@@ -12609,8 +12622,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr "Означение"
@@ -12651,21 +12664,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr "Слой / Ниво"
@@ -12679,8 +12692,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr "Брой платна"
@@ -12698,15 +12711,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr "Макс. скорост (км/ч)"
@@ -12743,16 +12756,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr "Еднопосочна"
@@ -12794,19 +12807,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Мост"
@@ -12842,19 +12855,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr "Тунел"
@@ -12888,18 +12901,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr "Просека"
@@ -12933,18 +12946,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr "Насип"
@@ -12952,5 +12965,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr "Автомагистрална връзка"
@@ -12959,5 +12972,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr "Редактиране автомагистрална връзка"
@@ -12965,5 +12978,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr "Автострада"
@@ -12972,5 +12985,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr "Редактиране автострада"
@@ -12980,6 +12993,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr "Магистрала"
@@ -12987,5 +13000,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr "Автострадна връзка"
@@ -12994,5 +13007,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr "Редактиране автострадна връзка"
@@ -13005,5 +13018,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Първокласен път / главна"
@@ -13012,5 +13025,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr "Редактиране първокласен път"
@@ -13018,10 +13031,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr "Връзка с първокласен път"
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr "Редактиране връзка с първокласен път"
@@ -13033,5 +13046,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Второкласен път"
@@ -13041,5 +13054,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr "Редактиране второкалсен път"
@@ -13047,5 +13060,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr "Третокласен"
@@ -13055,5 +13068,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr "Редактиране третокласен път"
@@ -13065,5 +13078,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Некласифициран"
@@ -13073,5 +13086,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr "Редактиране некласифициран път"
@@ -13098,19 +13111,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr "Ширина (метри)"
@@ -13122,5 +13135,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Улица"
@@ -13129,5 +13142,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr "Редактиране улица от населено място"
@@ -13151,13 +13164,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr "Пътна настилка"
@@ -13177,20 +13190,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr "асфалтиран път"
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr "неасфалтиран път"
@@ -13198,12 +13211,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr "павиран път"
@@ -13211,5 +13224,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr "Жилищна улица"
@@ -13218,5 +13231,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr "Редактиране жилищна улица"
@@ -13224,5 +13237,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr "Помощна улица"
@@ -13231,5 +13244,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr "Редактиране помощна улица"
@@ -13239,18 +13252,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr "Тип помощна улица"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr "алея"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr "автомобилен"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr "паркинг"
@@ -13258,5 +13271,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr "Улица паркинг"
@@ -13266,5 +13279,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr "Редактиране улица паркинг"
@@ -13272,5 +13285,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr "Път (неизвестен тип)"
@@ -13279,5 +13292,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr "Редактиране път от неизвестен тип"
@@ -13286,20 +13299,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr "Пътни ограничения"
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr "Редактиране пътни ограничения"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr "Пътна такса"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr "Без изход"
@@ -13312,8 +13325,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr "Достъп"
@@ -13357,23 +13370,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr "да"
@@ -13386,40 +13399,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr "частен"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr "предназначен"
@@ -13432,19 +13445,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr "с назначение"
@@ -13467,65 +13480,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr "разрешителен"
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr "селскостопански"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr "не"
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr "лек камион (до 3.5т)"
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Камион (над 3.5т)"
@@ -13540,10 +13553,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr "Кон"
@@ -13559,13 +13572,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr "Мотоциклет"
@@ -13581,30 +13594,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr "Автомобил"
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr "Обществен транспорт"
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr "Моторна лодка"
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr "Лодка"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr "Мин. скорост (км/ч)"
@@ -13612,25 +13625,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr "Макс. маса (т)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr "Макс.височина (метри)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr "макс.ширина (метри)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr "макс.дължина (метри)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr "Кръгово движение"
@@ -13641,5 +13654,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr "Редактиране пътен възел"
@@ -13661,9 +13674,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr "Тип"
@@ -13683,10 +13696,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr "автомагистрала"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr "Автомагистрална връзка"
@@ -13708,10 +13721,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr "автострада"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr "Автострадна връзка"
@@ -13733,10 +13746,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr "главен / първокласен"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr "Връзка с главен път"
@@ -13758,6 +13771,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr "второкласен"
@@ -13771,9 +13784,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr "третокласен"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr "Некласифициран"
@@ -13787,9 +13800,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr "улица"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr "Жилищна улица"
@@ -13819,10 +13832,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr "служебна"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr "Направлява автобуси"
@@ -13830,4 +13843,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13845,6 +13865,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr "ремонт"
@@ -13855,10 +13875,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr "Редактирай мост"
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr "Редактиране тунел"
@@ -13866,19 +13886,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr "Пътища"
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr "Пътен ремонт"
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr "Редактиране пътен ремонт"
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr "Пътен възел"
@@ -13894,5 +13914,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr "кръгово"
@@ -13901,5 +13921,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr "Алея за езда"
@@ -13907,5 +13927,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr "Редактиране алея за езда"
@@ -13913,5 +13933,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr "Велоалея"
@@ -13921,5 +13941,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr "Редактиране велоалея"
@@ -13927,5 +13947,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr "Алея / Тротоар"
@@ -13934,5 +13954,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr "Редактиране на алея или тротоар"
@@ -13940,5 +13960,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr "Пешеходна улица"
@@ -13947,5 +13967,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr "Редактирай пешеходна улица"
@@ -13953,5 +13973,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr "Стълбище"
@@ -13961,5 +13981,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr "Редактирай стълбище"
@@ -13968,5 +13988,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr "Черен път"
@@ -13975,14 +13995,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr "Редактирай черен път"
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr "бетон"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr "чакъл"
@@ -13990,18 +14010,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr "грунт"
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr "трева"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr "пясък"
@@ -14009,5 +14029,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr "Черен път 1-ви клас"
@@ -14016,5 +14036,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr "Редактирай черен път 1-ви клас"
@@ -14022,5 +14042,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr "Черен път 2-ри клас"
@@ -14029,5 +14049,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr "Редактирай черен път 2-ри клас"
@@ -14035,5 +14055,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr "Черен път 3-ти клас"
@@ -14042,5 +14062,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr "Редактирай черен път 3-ти клас"
@@ -14048,5 +14068,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr "Черен път 4-ти клас"
@@ -14055,5 +14075,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr "Редактирай черен път 4-ти клас"
@@ -14061,5 +14081,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr "Черен път 5-ти клас"
@@ -14068,5 +14088,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr "Редактирай черен път 5-ти клас"
@@ -14075,5 +14095,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr "Пътека"
@@ -14082,13 +14102,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr "Редактирай пътека"
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr "Снегоход"
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr "Ски"
@@ -14096,5 +14116,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr "Туристическа пътека"
@@ -14104,5 +14124,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr "Редактиране туристическа пътека"
@@ -14110,5 +14130,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr "Планинска туристическа пътека"
@@ -14118,5 +14138,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr "Редактиране планинска туристическа пътека"
@@ -14124,5 +14144,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr "Трудна планинска туристическа пътека"
@@ -14132,5 +14152,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Редактиране трудна планинска туристическа пътека"
@@ -14138,5 +14158,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr "Алпийска туристическа пътека"
@@ -14146,5 +14166,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr "Редактиране алпийска туристическа пътека"
@@ -14152,5 +14172,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr "Трудна алпийска туристическа пътека"
@@ -14160,5 +14180,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Редактиране трудна алпийска туристическа пътека"
@@ -14166,5 +14186,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr "Екстремна алпийска туристическа пътека"
@@ -14174,5 +14194,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Редактиране екстремна алпийска туристическа пътека"
@@ -14180,10 +14200,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr "Пътни точки"
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr "Магистрален възел"
@@ -14191,15 +14211,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr "Редактирай магистрален възел"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr "Номер"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr "Услуги"
@@ -14207,5 +14227,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr "Редактирай служба услуги"
@@ -14240,14 +14260,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr "Оператор"
@@ -14256,5 +14276,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr "Светофар"
@@ -14264,5 +14284,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr "Тип пешеходна пътека"
@@ -14271,27 +14291,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr "неконтролирано"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr "светофар"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr "остров"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr "немаркиран"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr "Пресичане върху кон"
@@ -14299,6 +14319,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr "Пресичане с велосипед"
@@ -14307,11 +14327,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr "Помощник при пресъчане"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr "Име на типа пътека (UK)"
@@ -14319,30 +14339,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr "зебра"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr "светофар контролиран от пешеходци"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr "Стоп"
@@ -14350,5 +14370,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr "Пешеходна пътека"
@@ -14357,14 +14377,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr "Редактиране на пресечно място или кръстовище"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr "Тип име (UK)"
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr "Мини кръгово движение"
@@ -14375,14 +14395,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr "Посока"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr "по часовниковата стрелка"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr "Обръщало"
@@ -14392,20 +14412,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr "Табела оказваща начало/край населено място"
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr "Редактирай знак за ограничение в град"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr "Второ име"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr "Пътна камера"
@@ -14413,5 +14433,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr "Телефон за спешен случай"
@@ -14419,5 +14439,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr "Наклон"
@@ -14425,5 +14445,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr "Стръмен наклон"
@@ -14432,10 +14452,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr "Брод"
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr "Редактирай брод"
@@ -14443,5 +14463,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr "Планински проход"
@@ -14449,5 +14469,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr "Редактирай планински проход"
@@ -14459,7 +14479,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr "Надморска височина"
@@ -14467,5 +14487,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr "Прегради"
@@ -14473,5 +14493,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr "Дирек"
@@ -14479,5 +14499,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr "Редактирай дирек"
@@ -14516,18 +14536,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr "Разрешено преминаване:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr "Вело бариера"
@@ -14536,5 +14560,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr "Бетонен блок"
@@ -14542,5 +14566,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr "Тексаска мрежа (препятствие за животни)"
@@ -14548,10 +14572,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr "Редактирай тексаска мрежа"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr "Бус трап"
@@ -14559,15 +14583,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr "Шипове"
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr "Редактиране шипове"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr "Място за плащане пътна такса"
@@ -14575,5 +14599,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr "Редактирай място за плащане пътна такса"
@@ -14581,10 +14605,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr "Граничен контрол"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr "Редактирай граничен контрол"
@@ -14594,5 +14618,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr "Плет"
@@ -14601,5 +14625,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr "Ограда / стобор"
@@ -14608,5 +14632,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr "Стена"
@@ -14614,5 +14638,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr "Градска стена"
@@ -14621,5 +14645,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr "Подпорна стена"
@@ -14631,15 +14655,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr "Вход"
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr "Редактирай вход"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr "Порта"
@@ -14647,50 +14671,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr "Редактирай порта"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr "Вдигаще се врата"
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr "Вдигаще се врата"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr "Врата с бодлива тел"
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr "Редактирай врата с бодлива тел"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr "Накланяща преграда (bump gate)"
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr "Редактирай накланяща преграда"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr "Кисинг гейт (преграда срещу животни)"
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr "Редактирай кисинг гейт"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr "Стъпалова преграда"
@@ -14698,15 +14722,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr "Редактирай стъпалова преграда"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+#, fuzzy
+msgid "Turnstile"
+msgstr "ЖП Обръщаща платформа"
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "Редактирай стъпалова преграда"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr "Двойна врата"
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr "Редактирай двойна врата"
@@ -14717,10 +14753,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr "Вода"
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr "Извор"
@@ -14728,5 +14764,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr "Редактирай извора"
@@ -14734,5 +14770,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr "Отточен канал"
@@ -14740,10 +14776,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr "Редактирай отточен канал"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr "Поток"
@@ -14751,10 +14787,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr "Редактирай поток"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr "Канал"
@@ -14762,10 +14798,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr "Редактирай канал"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr "Река"
@@ -14775,5 +14811,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr "Редактирай река"
@@ -14781,15 +14817,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr "Редактирай водата"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr "Суша"
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr "Редактирай сушата"
@@ -14797,15 +14833,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr "Басейн"
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr "Редактиране на басейн"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr "Резервоар"
@@ -14813,15 +14849,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr "Редактирай резервоар"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr "Закрит резервоар"
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr "Редактирай закрит резервоар"
@@ -14829,5 +14865,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr "Речен бряг"
@@ -14836,10 +14872,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr "Редактирай речен бряг"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr "Мочурище"
@@ -14850,14 +14886,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr "Редактирай мочурището"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr "блато"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr "тресавище"
@@ -14871,35 +14907,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr "блато"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr "тръстенак"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr "солени блата / солници"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr "приливно-отливно крайбрежие"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr "мангрова гора"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr "Кал"
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr "Редактирай калта"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr "Плаж"
@@ -14907,20 +14943,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr "Редактирай плажа"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr "Залив"
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr "Редактирай залива"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr "Скала"
@@ -14928,10 +14964,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr "Редактирай скалата"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr "Крайбрежие"
@@ -14939,5 +14975,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr "Редактирай крайбрежието"
@@ -14945,5 +14981,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr "Ферибот маршрут"
@@ -14951,5 +14987,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr "Ферибот"
@@ -14958,5 +14994,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr "Корабостроителница"
@@ -14964,10 +15000,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr "Редактирай корабостроителница"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr "Док"
@@ -14975,5 +15011,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr "Редактирай док"
@@ -14981,5 +15017,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr "Язовирна стена"
@@ -14987,15 +15023,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr "Редактирай язовирна стена"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr "Хидротехническо съоръжение"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr "Шлюзова врата"
@@ -15004,5 +15040,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr "Бент / преливник"
@@ -15010,20 +15046,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr "Редактирай бент / преливник"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr "Водопад"
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr "Редактирай водопад"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr "Разширение за обръщане"
@@ -15032,15 +15068,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr "Пристанище за яхти"
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr "Редактирай пристанище за яхти"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr "Кей"
@@ -15048,10 +15084,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr "Редактирай кей"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr "Ферибот терминал"
@@ -15059,10 +15095,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr "Редактирай ферибот терминал"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr "Хелинг"
@@ -15072,5 +15108,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr "Редактирай хелинг"
@@ -15078,10 +15114,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr "Железница"
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr "ЖП Линия"
@@ -15089,5 +15125,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr "Редактирай ЖП Линия"
@@ -15117,8 +15153,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr "Незадължителни типове"
@@ -15132,35 +15168,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr "двор"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr "ЖП стрелка"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr "скоростна"
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr "Теснолинейка"
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr "Редактирай теснолинейка"
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr "Монорелса"
@@ -15168,45 +15204,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr "Редактирай монорелса"
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr "Историческа ЖП линия"
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr "Редактирай историческа ЖП линия"
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr "Лека ЖП линия"
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr "Редактирай лека ЖП линия"
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr "Метро"
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr "Редактирай метро"
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr "Трамвай"
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr "Редактирай трамвай"
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr "Направляван автобус"
@@ -15214,5 +15250,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr "Редактирай направляван автобус"
@@ -15221,14 +15257,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr "Неизползвана ЖП линия"
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr "Редактирай неизползвана ЖП линия"
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr "Изоставена ЖП линия"
@@ -15237,5 +15273,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr "Регулиран ЖП прелез"
@@ -15244,5 +15280,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr "ЖП прелез"
@@ -15252,5 +15288,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr "Тип пресичане"
@@ -15258,5 +15294,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr "ЖП Обръщаща платформа"
@@ -15265,10 +15301,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr "Надземни линии"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr "Седалков лифт"
@@ -15276,10 +15312,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr "Редактирай седалков лифт"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr "Влек"
@@ -15287,10 +15323,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr "Редактирай влек"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr "Кабинков лифт"
@@ -15298,10 +15334,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr "Редактирай кабинков лифт"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr "Гондола"
@@ -15309,5 +15345,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr "Редактиране на гондола"
@@ -15315,5 +15351,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr "Гара / Станция / Спирка"
@@ -15324,10 +15360,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr "Редактирай станция"
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr "Бензиностанция"
@@ -15337,5 +15373,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr "Редактирай бензиностанция"
@@ -15351,5 +15387,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15359,5 +15395,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr "Редактирай паркинг"
@@ -15365,41 +15401,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr "Капацитет"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr "наземен"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr "на няколко нива"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr "подземен"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr "паркинг за прехвърляне на обществен транспорт"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr "Места за инвалиди"
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr "Такса"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr "Автомивка"
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr "Редактирай автомивка"
@@ -15407,5 +15443,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr "Магазин"
@@ -15413,15 +15449,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr "Редактирай автосалон"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr "Сервиз"
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr "Редактирай автосервиз"
@@ -15429,5 +15465,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr "Под наем"
@@ -15436,10 +15472,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr "Редактиране коли под наем"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr "Споделяне на автомобили"
@@ -15447,5 +15483,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr "Редактирай споделяне автомобили"
@@ -15453,5 +15489,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr "Велосипедна стоянка (паркинг)"
@@ -15460,5 +15496,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr "Редактиране велосипеди под наем"
@@ -15467,15 +15503,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr "Редактирай вело-магазин"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "Обществен транспорт"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr "UIC-Референция"
@@ -15483,5 +15519,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr "Малка ЖП гара"
@@ -15489,5 +15525,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr "Редактирай малка ЖП гара"
@@ -15495,5 +15531,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr "Трамвайна спирка"
@@ -15502,5 +15538,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr "Редактирай трамвайна спирка"
@@ -15508,5 +15544,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr "ЖП платформа"
@@ -15515,5 +15551,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr "Редактирай ЖП платформа"
@@ -15525,5 +15561,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr "Референция (коловоз #)"
@@ -15531,10 +15567,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr "Област"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr "Вход в метро"
@@ -15543,10 +15579,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr "Редактирай вход в метро"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr "Инвалидна количка"
@@ -15555,5 +15591,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr "Автогара"
@@ -15562,5 +15598,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr "Редактирай автогара"
@@ -15568,5 +15604,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr "Автобусна спирка"
@@ -15576,5 +15612,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr "Редактирай автобусна спирка"
@@ -15585,6 +15621,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr "Навес"
@@ -15592,10 +15628,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr "Автобусна платформа"
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr "Редактирай автобусна платформа"
@@ -15603,5 +15639,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr "Такси"
@@ -15609,5 +15645,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr "Редактирай стоянка таксита"
@@ -15615,5 +15651,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr "Летище"
@@ -15621,15 +15657,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr "Редактиране летище"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr "ICAO"
@@ -15638,5 +15674,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr "Настаняване"
@@ -15648,5 +15684,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Хотел"
@@ -15655,15 +15691,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr "Редактирай хотел"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr "Звезди"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr "Мотел"
@@ -15671,20 +15707,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr "Редактирай мотел"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr "Къща за гости"
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr "Редактирай къща за гости"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr "Бунгало"
@@ -15692,10 +15728,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr "Редактирай бунгало"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr "Хостел / студентско общежитие"
@@ -15703,30 +15739,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr "Редактирай хостел / студентско общежитие"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr "Планинска хижа"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr "Редактирай планинска хижа"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr "Площадка за каравани"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr "Редактирай площадка за каравани"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr "Къмпинг"
@@ -15734,10 +15770,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr "Редактирай къмпинг"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "Храна и напитки"
@@ -15748,5 +15784,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ресторант"
@@ -15754,5 +15790,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr "Редактирай ресторант"
@@ -15760,5 +15796,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr "Кухня"
@@ -15766,61 +15802,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr "италианска"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr "китайска"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr "пица"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr "бургери"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr "гръцка"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr "немска"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr "индийска"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr "местна"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr "кебаб"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr "турска"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr "азиатска"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr "тайландска"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr "мексиканска"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr "японска"
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr "Заведение за бързо хранене"
@@ -15828,9 +15864,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr "Редактирай заведение бързо хранене"
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr "Кафене"
@@ -15838,10 +15874,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr "Редактирай кафене"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr "Бар"
@@ -15849,20 +15885,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr "Редактирай бар"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr "Бирария"
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr "Редактирай бирария"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr "Бар"
@@ -15870,10 +15906,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr "Редактиране на бар"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr "Нощен клуб"
@@ -15881,20 +15917,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr "Редактирай нощен клуб"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "Туризъм"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr "Атракция"
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr "Редактирай забележилтеност"
@@ -15903,11 +15939,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr "Работно време"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "Музей"
@@ -15915,10 +15951,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr "Редактирай музей"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "Зоопарк"
@@ -15927,10 +15963,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr "Редактирай зоопарк"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr "Място с добра гледка"
@@ -15938,25 +15974,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr "Редактирай място с добра гледка"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr "Наблюдателница"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr "Развлекателен парк"
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr "Редактирай развлекателен парк"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr "Творба на изкуството"
@@ -15964,5 +16000,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr "Редактирай творба на изкуството"
@@ -15970,5 +16006,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr "Информационен пункт"
@@ -15976,80 +16012,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr "Редактиране на информационен пункт"
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "Карта"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr "Тип карта"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr "карта"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr "карта на града"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr "карта туристически маршрути"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr "карта на веломаршрути"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
 msgid "Closer Description"
 msgstr "По-подробно описание"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1701
 msgid "Information Board"
 msgstr "Информационно табло"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Board Type"
 msgstr "Тип табло"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "board"
 msgstr "информативна дъска"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "history"
 msgstr "история"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "nature"
 msgstr "природа"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "wildlife"
 msgstr "дива природа"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Guidepost (Hiking)"
 msgstr "Водач"
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr "Други информационни точки"
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr "Редактирай навес"
@@ -16057,25 +16093,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr "място за огън"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr "Място за пикник"
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr "Редактирай място за излет"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "Исторически места"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "Замък"
@@ -16084,20 +16120,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr "Редактирай замък"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "Руини"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr "Редактирай руини"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr "Архиологични разкопки"
@@ -16106,10 +16142,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr "Редактирай архиологични разкопки"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr "Поле на битка"
@@ -16117,5 +16153,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr "Редактирай поле на битка"
@@ -16123,15 +16159,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr "Забележителност"
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr "Редактирай забележителност"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr "Паметник"
@@ -16139,45 +16175,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr "Редактирай паметник"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr "Крайпътен кръст"
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr "Редактирай крайпътен кръст"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr "Крайпътен параклис"
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr "Редактирай крайпътен параклис"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "Места за отдих и развлечения"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr "Аквапарк"
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr "Редактирай аквапарк"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "Площадка"
@@ -16185,15 +16221,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr "Редактирай площадка"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "Риболов"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr "Редактирай риболов"
@@ -16201,15 +16237,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr "Спортни съоражения"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "Стадион"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr "Редактирай стадион"
@@ -16223,6 +16259,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "вид спорт:"
@@ -16245,4 +16281,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -16303,5 +16347,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16311,5 +16363,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16455,5 +16507,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16559,5 +16611,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16598,29 +16650,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr "спорт"
@@ -16630,227 +16683,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr "многобой"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr "стрелба с лък"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr "атлетика"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr "австралийски футбол"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr "бейзбол"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr "баскетбол"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr "игра с мет.топчета"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr "игра с асим.топки"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr "кану"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr "алпинизъм"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr "крикет"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr "крикет мрежи"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr "крокет"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr "велоспорт"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr "кучешки надбягвания"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr "конна езда"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr "футбол"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr "голф"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr "гимнастика"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr "хокей"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr "конни надбягвания"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr "моторен спорт"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr "бейзбол"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr "ракет бол"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr "ръгби"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr "стрелба"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr "скейтборд"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr "фигурно пързаляне"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr "ски"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "футбол"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr "плуване"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "тенис на маса"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr "тенис"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr "Спортен център"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr "Редактирай спортен център"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr "Игрище"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr "Редактирай игрище"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr "Състезателна писта"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr "Редактирай състезателна писта"
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr "Поле за голф"
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr "Редактирай поле за голф"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr "Миниголф"
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr "Редактирай миниголф"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr "Спорт"
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr "Многобой"
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr "Редактирай многобой"
@@ -16889,191 +16942,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr "игрище"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr "спортен център"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr "стадион"
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr "Боулинг зала"
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr "Редактирай боулинг зала"
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr "Атлетика"
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr "Редактирай атлетика"
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr "Стрелба с лък"
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr "Редактирай стрелба с лък"
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr "Скално катерене"
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr "Редактирай скално катерене"
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr "Кану"
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr "Редактирай кану"
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr "Велосипедизъм"
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr "Редактирай велосипедизъм"
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr "Надпреварване с кучета"
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr "Редактирай надбягвания с кучета"
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr "Конна езда"
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr "Редактирай конна езда"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr "Конни надбягвания"
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr "Редактирай конни надбягвания"
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr "Гимнастика"
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr "Редактирай гимнастика"
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr "Моторни спортове"
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr "Редактирай моторни спортове"
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr "Фигурно пързаляне"
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr "Редактирай фигурно пързаляне"
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr "Скейтборд"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr "Редактирай скейтборд"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr "Плуване"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr "Редактирай плуване"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr "Ски"
@@ -17081,56 +17134,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr "Редактирай ски"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr "Тип писта"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr "спускане"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr "нордическа"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr "Зимен парк"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr "Трудност"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr "начинаещ"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr "лесно"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr "за средно ниво"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr "за напреднали"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr "експерт"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr "свободна езда"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr "Стрелба"
@@ -17138,178 +17191,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr "Редактирай стрелба"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr "Спорт (с топка)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr "Футбол"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr "Редактирай футбол"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr "Американски футбол"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr "Редактирай американски футбол"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr "Австралийски футбол"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr "Редактирай австралийски футбол"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr "Бейсбол"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr "Редактирай бейсбол"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr "Редактирай баскетбол"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr "Голф"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr "Редактирай голф"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr "поле за голф"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr "Буле (игра с мет.топчета)"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr "Редактирай Игра с мет.топчета"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr "Игра с асим.мет.топки (bowls)"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr "Редактирай игра с асим.мет.топки"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr "Крикет"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr "Редактирай крикет"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr "Крикет мрежи"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr "Рекдатирай крикет мрежи"
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr "Крокет"
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr "Редактирай крокет"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr "Хокей"
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr "Редактирай хокей"
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr "Пелота"
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr "Редактирай пелота"
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr "ракет"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr "Редактирай ракет"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr "Ръгби"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr "Редактирай ръгби"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr "Тенис на маса"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr "Редактирай тенис на маса"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr "Тенис"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr "Редактирай тенис"
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "Сгради"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr "Строеж"
@@ -17317,5 +17370,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "Обществена сграда"
@@ -17323,10 +17376,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr "Редактирай обществена сграда"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "Кметство"
@@ -17334,10 +17387,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "Редактирай кметство"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "Посолство"
@@ -17345,10 +17398,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "Редактирай посолство"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "Съдебна сграда"
@@ -17357,10 +17410,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "Редактирай съдебна сграда"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "Затвор"
@@ -17369,10 +17422,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "Редактирай затвор"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "Полиция/Милиция"
@@ -17382,10 +17435,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "Редактирай полиция/милиция"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "Пожарна"
@@ -17394,10 +17447,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "Редактирай пожарна"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "Пощенска станция"
@@ -17405,5 +17458,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr "Редактирай пощенска станция"
@@ -17411,15 +17464,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr "Детска градина"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr "Редактирай детска градина"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "Училище"
@@ -17427,10 +17480,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "Редактирай училището"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr "Университет"
@@ -17438,10 +17491,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr "Редактирай университет"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr "Колеж"
@@ -17449,5 +17502,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr "Редактирай колеж"
@@ -17455,5 +17508,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "Кино"
@@ -17462,10 +17515,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "Редактирай кино"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "Библиотека"
@@ -17474,10 +17527,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "Редактирай библиотека"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr "Център на изкуствата"
@@ -17485,10 +17538,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr "Редактирай център на изкуствата"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "Театър"
@@ -17497,10 +17550,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "Редактирай театър"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr "Място за богослужение"
@@ -17510,5 +17563,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr "Редактирай място за богослужение"
@@ -17517,6 +17570,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr "Религия"
@@ -17525,66 +17578,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr "Бахаи"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr "Будизъм"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr "Християнство"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr "Индуизъм"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr "Джайнизъм"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr "Юдаизъм"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr "Мусулманство"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr "Сикхизъм"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr "Спиритуализъм"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr "Даосизъм"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr "Унитаристи"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr "Зороастризъм"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr "Конфесия"
@@ -17593,81 +17646,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr "Англиканска"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr "Баптизъм"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr "Католическо"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr "Евангелска"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr "Свидетели на Йехова"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr "Лютеранство"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr "Методизъм"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr "Мормони"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr "Православие"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr "Петдесетници"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr "Пресвитериани"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr "Протестантизъм"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr "Кваркери"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr "Шийти"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr "Сунити"
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr "Адреси"
@@ -17676,5 +17729,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr "Редактиране на информацията за адреса"
@@ -17682,5 +17735,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr "Номер"
@@ -17688,20 +17741,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr "Име на дом"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr "Име на град"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "Пощенски код"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr "Код на държава"
@@ -17709,5 +17762,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr "Интерполация на адреси"
@@ -17716,5 +17769,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr "Редактирай интерполация на адреси"
@@ -17722,71 +17775,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr "Схема на номериране"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr "нечетни"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr "четни"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr "всички"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr "по азбучен ред"
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr "Изкуствени"
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr "Цех"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr "Редактирай цех"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "Кула"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "Редактирай кула"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "Водонапорна кула"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "Редактирай водонапорна кула"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr "Газохранилище"
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr "Редактирай газохранилище"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "Маяк / Светлинен фар"
@@ -17794,10 +17847,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "Редактирай маяк / светлинен фар"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "Мелница"
@@ -17805,10 +17858,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "Редактирай мелница"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "Тръбопровод"
@@ -17816,10 +17869,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "Редактирай газопровод"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr "Пречиствателна станция"
@@ -17829,10 +17882,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr "Редактирай пречиствателна станция"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr "Кран"
@@ -17840,10 +17893,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr "Редактирай кран"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr "Маяк / Радиопредавател"
@@ -17851,10 +17904,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr "Редактирай маяк / радиопредавател"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr "Точка на наблюдение"
@@ -17862,10 +17915,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr "Редактирай точка на наблюдение"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr "Видеонаблюдение"
@@ -17873,5 +17926,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr "Редактирай видеонаблюдение"
@@ -17879,5 +17932,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr "Електроцентрала"
@@ -17887,39 +17940,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr "Редактирай електрогенератор"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr "вятърна енергия"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr "водна енергия"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr "енергия от изкопаеми горива"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr "атомна"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr "въглища"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr "слънчева енергия"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr "газ"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr "Електростанция"
@@ -17928,10 +17981,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr "Редактирай електростанция"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr "Електроподстанция"
@@ -17940,5 +17993,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr "Редактирай електроподстанция"
@@ -17946,10 +17999,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr "Номер линия"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr "Електрически стълб от ЕПМ"
@@ -17960,5 +18013,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr "Редактирай стълб от ЕПМ"
@@ -17966,5 +18019,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr "Линия за електропренос"
@@ -17973,25 +18026,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr "Редактирай линия за електропренос"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr "Волтаж"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr "Брой жици"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr "Обществени удобства"
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "Тоалетни"
@@ -17999,20 +18052,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr "Ref номер"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr "Забележка"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr "Пощенска кутия"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "Телефон"
@@ -18021,5 +18074,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr "Редактирай телефон"
@@ -18027,5 +18080,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "Монети"
@@ -18033,5 +18086,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr "Банкноти"
@@ -18039,5 +18092,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr "Електрони средства за разплата"
@@ -18045,5 +18098,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr "Дебитни карти"
@@ -18051,15 +18104,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "Кредитни карти"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "Телефонни карти"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr "Рециклиране"
@@ -18068,5 +18121,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr "Редактиране на станция за рециклиране"
@@ -18074,35 +18127,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr "Батерии"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr "Консервни кутии"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr "Дрехи"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr "Стъкло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr "Хартия"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr "Вторични суровини"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr "Скамейка"
@@ -18111,20 +18164,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr "Ловно скривалище"
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr "Редактирай ловно скривалище"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr "Скривалище"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr "Заключване"
@@ -18132,22 +18185,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr "Височина"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr "нисък"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr "среден"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr "пълен"
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr "Фонтан"
@@ -18156,10 +18209,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr "Редактирай фонтан"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "Питейна вода"
@@ -18168,10 +18221,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "Редактирай питейна вода"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr "Дестка ясла"
@@ -18179,25 +18232,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr "Редактирай детска ясла"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "Магазини"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr "Супермаркет"
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr "Редактирай супермаркет"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr "Бакалия"
@@ -18205,10 +18258,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr "Редактирай бакалия"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr "Будка"
@@ -18216,10 +18269,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr "Редактирай будка"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "Автомат за стоки"
@@ -18227,5 +18280,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "Редактирай автомат за стоки"
@@ -18233,88 +18286,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "Продукти за автоматична продажба"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr "билети за обществен транспорт"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr "карта на обществен транспорт"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr "билети за паркиране"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr "храна"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "напитки"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr "сладки"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr "цигари"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr "фотографии"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr "храна за животни"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "вестници"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "играчки"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr "пощенски марки"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "SIM-карти"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr "телефонни ваучери"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr "ваучери"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr "презервативи"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr "тампони"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr "торби за екскременти"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr "клиентски карти"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "Месарница"
@@ -18322,10 +18375,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "Редактирай месарница"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "Фурна"
@@ -18333,10 +18386,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "Редактирай фурна"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr "Цветарски магазин"
@@ -18344,20 +18397,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr "Редактирай цветарски магазин"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr "Био магазин"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr "Редактирай био магазин"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr "Алкохол"
@@ -18365,60 +18418,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr "Редактиране магазин за алкохол"
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr "Напитки"
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr "Редактиране магазин за безалкохолни"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr "Компютри"
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr "Редактирай компютърен магазин"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr "Електроника"
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr "Редактирай магазин за електроника"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr "Аудио HiFi"
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr "Редактирай магазин за Аудио HiFi"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr "Мебелен магазин"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr "Редактирай мебелен магазин"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr "Градински център"
@@ -18426,10 +18479,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr "Редактирай градински център"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr "Железария"
@@ -18437,10 +18490,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr "Редактирай железария"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr "Магазин \"Направи си сам\""
@@ -18448,60 +18501,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr "Редактирай магазин \"Направи си сам\""
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr "Книжарница"
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr "Редактирай книжарница"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr "Фризьорски салон / козметика"
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr "Редактирай фризьорски салон / козметика"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr "Обувки"
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr "Редактирай магазин за обувки"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr "Играчки"
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr "Редактирай магазин за играчки"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr "Видео"
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr "Редактирай Видео-магазин"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "Химическо чистене"
@@ -18509,10 +18562,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "Редактирай химическо чистене"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "Пералня"
@@ -18520,10 +18573,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "Редактирай пералня"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr "Туристически стоки (за активен отдих)"
@@ -18531,35 +18584,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr "Редактирай мазизин за туристически стоки"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr "Спортни стоки"
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr "Редактирай магазин за спортни стоки"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr "Оптика"
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr "Редактирай оптика"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "Пари"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "Банка"
@@ -18567,5 +18620,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "Редактирай банка"
@@ -18573,10 +18626,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "Банкомат"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr "Обмяна на валута"
@@ -18584,5 +18637,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr "Редактирай обмяна на валута"
@@ -18590,15 +18643,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "Редактирай банкомат"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "Здраве"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr "Доктори"
@@ -18606,20 +18659,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr "Редактирай доктори"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr "Стоматолог"
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr "Редактирай стоматолигия"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "Аптека"
@@ -18627,5 +18680,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "Редактирай аптека"
@@ -18633,10 +18686,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr "Приготвят лекарства по рецепти"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "Болница"
@@ -18644,10 +18697,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "Редактирай болница"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr "Пункт за връзка със спешна помощ"
@@ -18656,5 +18709,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr "Редактирай пункт за връзка със спешна помощ"
@@ -18663,20 +18716,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr "Номер на пункта"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr "Име на пункта"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr "Телефонен номер"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Използвайте международен код, като например +12-345-67890)"
@@ -18684,5 +18737,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr "Ветеринар"
@@ -18691,56 +18744,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr "Редактирай ветеринар"
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr "Континент"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr "Редактирай континент"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr "Държава"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr "Редактирай държава"
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr "Област/Щат"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr "Редактирай област/щат"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr "Област"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr "Редактирай област"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr "Графство"
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr "Редактирай графство"
@@ -18748,15 +18800,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr "Град (над 100 000)"
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr "Редактирай голям град"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr "Град (под 100 000)"
@@ -18764,10 +18816,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr "Редактирай град"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr "Квартал/предградие"
@@ -18775,25 +18827,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr "Редактирай квартал"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "Село"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "Редактирай село"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr "Махала"
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr "Редактирай махала"
@@ -18801,5 +18853,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr "Местност"
@@ -18807,10 +18859,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr "Редактирай местност"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "Остров"
@@ -18818,5 +18870,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "Редактирай остров"
@@ -18824,5 +18876,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr "Пещерен вход"
@@ -18830,10 +18882,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr "Редактиране пещерен вход"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "Връх"
@@ -18841,10 +18893,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "Редактиране връх"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr "Ледник"
@@ -18852,10 +18904,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr "Редактиране ледник"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr "Вулкан"
@@ -18863,70 +18915,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr "Редактиране вулкан"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr "Граници"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr "Национална"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr "Редактирай национална граница"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr "Административна"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr "Редактирай административна граница"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr "Гражданска"
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr "Редактирай гражданска граница"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr "Политическа"
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr "Редактирай политическа граница"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr "Национален парк"
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr "Редактирай граница национален парк"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr "Земеползване"
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "Дърво"
@@ -18935,15 +18987,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "Редактирай дърво"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr "Ботаническо название"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr "Гора"
@@ -18952,5 +19004,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr "Редактирай гората"
@@ -18958,17 +19010,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr "иглолистен"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr "широколистен"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr "смесен"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "Гора"
@@ -18977,14 +19029,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr "Редактирай гора"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr "Природен резерват"
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr "Редактирай природен резерват"
@@ -18992,25 +19044,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr "Сипей"
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr "Редактирай сипей"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr "Шубрак"
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr "Редактирай шубрака"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr "Скалист склон"
@@ -19018,10 +19070,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr "Редактирай скалист склон"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr "Пустош"
@@ -19029,5 +19081,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr "Редактиране пустош"
@@ -19035,5 +19087,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr "Двор ферма"
@@ -19042,45 +19094,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr "Редактирай двор ферма"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr "Обработваема земя"
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr "Редактирай обработваема земя"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr "Поляна"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr "Редактиране поляна"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr "Лозе"
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr "Редактирай лозе"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr "Общинска земя"
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr "Редактирай общинска земя"
@@ -19088,25 +19140,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr "Градина"
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr "Редактирай градина"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr "Трева"
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr "Редактирай трева"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr "Зелено село"
@@ -19114,10 +19166,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr "Редактирай зелено селище"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr "Общи"
@@ -19125,20 +19177,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr "Редактирай общи"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr "Парк"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr "Редактирай парк"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr "Спортна площадка"
@@ -19146,5 +19198,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr "Редактирай спортна площадка"
@@ -19152,15 +19204,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr "Жилищна зона"
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr "Редактирай жилищна зона"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr "Църковно гробище"
@@ -19168,9 +19220,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr "Редактирай църковно гробище"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr "Гробище"
@@ -19178,39 +19230,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr "Редактирай гробище"
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr "Търговия на дребно"
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr "Редактирай търговия на дребно"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr "Търговия"
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr "Редактирай търговия"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr "Промишленост"
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr "Редактирай промишленост"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr "Железопътен път"
@@ -19218,15 +19270,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr "Редактирай ЖП"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr "Военен"
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr "Редакирай военна земя"
@@ -19234,55 +19286,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr "Строителна площадка"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr "Редактирай строителна площадка"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr "Индустриални развалини"
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr "Редактирай ундустриални развалини"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr "Зелени площи"
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr "Редактирай зелени площи"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr "Сметище"
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr "Редактирай сметище"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr "Кариера"
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr "Редактирай кариера"
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr "Мултиполигон"
@@ -19292,5 +19344,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr "Редактиране мултиполигон"
@@ -19299,10 +19351,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr "външен сегмент"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr "вътрешен сегмент"
@@ -19310,5 +19362,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr "Ограничения при завиване"
@@ -19317,5 +19369,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr "Редактиране на ограничения при завиване"
@@ -19323,34 +19375,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr "Ограничения"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr "забранен ляв завой"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr "забранен десен завой"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr "забранено напред"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr "забранен обратен завой"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr "само десен завой"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr "само ляв завой"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr "само направо"
@@ -19359,15 +19411,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr "от път"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr "през точка или път"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr "до път"
@@ -19375,5 +19427,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr "Маршрут"
@@ -19382,5 +19434,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr "Редактиране маршрут"
@@ -19388,5 +19440,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr "Тип маршрут"
@@ -19458,24 +19510,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr "велосипед"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr "автобус"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr "път"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr "ферибот"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr "ски"
@@ -19528,20 +19580,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr "пеш"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr "туристически маршрут"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr "трамваен маршрут"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr "обиколка"
@@ -19555,10 +19607,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr "метро"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr "Описание на символ"
@@ -19566,26 +19618,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr "Мрежа"
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "Тип маршрут"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr "предложен"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr "алтернативен"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr "временен"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr "връзка"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr "Цвят (hex)"
@@ -19594,30 +19652,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr "сегмент от маршрут"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr "сегмент напред"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr "сегмент назад"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr "точка за спиране"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr "точка за спиране напред"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr "точка за спиране назад"
@@ -19653,6 +19711,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19668,5 +19727,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19685,5 +19752,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr "стандартен"
@@ -19777,7 +19844,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr "мост"
@@ -20042,15 +20109,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr "остарял, вече невалиден"
@@ -20092,5 +20159,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr "кон"
@@ -20228,4 +20295,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20237,5 +20310,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20243,5 +20316,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20278,5 +20351,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20300,11 +20373,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr "бариера"
@@ -20328,5 +20401,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20367,5 +20440,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20403,6 +20476,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr "улица"
@@ -20458,7 +20531,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr "път_от_пътна_мрежа"
@@ -20511,11 +20584,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr "ЖП"
@@ -20536,5 +20617,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr "услуги"
@@ -20548,5 +20629,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr "форд"
@@ -20567,5 +20648,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr "обръщало"
@@ -20579,6 +20660,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr "точка за връзка със спешна помощ"
@@ -20593,5 +20674,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr "речен бряг"
@@ -20605,5 +20686,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr "поток"
@@ -20617,5 +20698,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr "док"
@@ -20643,5 +20724,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr "акведукт"
@@ -20784,5 +20865,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20809,13 +20890,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr "изкуствени съоръжения"
@@ -20877,7 +20958,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr "ЖП точка"
@@ -20900,10 +20981,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr "друга ЖП линия"
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr "ЖП railover"
@@ -20939,7 +21020,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr "стара ЖП линия"
@@ -20984,6 +21065,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr "въздушен транспорт"
@@ -20997,5 +21078,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr "терминал"
@@ -21017,5 +21098,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr "Надземен_транспорт_тъмен"
@@ -21029,5 +21110,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr "Надземен_транспорт_светъл"
@@ -21035,4 +21116,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21075,7 +21163,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr "надземен транспорт"
@@ -21092,5 +21180,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr "лесна ски писта"
@@ -21105,5 +21193,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr "средно трудна ски писта"
@@ -21118,5 +21206,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr "ски писта за напреднали"
@@ -21131,5 +21219,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr "ски писта за експерти"
@@ -21144,5 +21232,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr "ски писта freeride"
@@ -21157,5 +21245,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr "ски писта за начинаещи"
@@ -21178,4 +21266,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -21186,4 +21281,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -21260,10 +21363,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr "захранване"
@@ -21277,5 +21381,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr "кей"
@@ -21289,5 +21393,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr "тръбопровод"
@@ -21415,12 +21519,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr "отдих и развлечение"
@@ -21434,5 +21538,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr "яхт пристан"
@@ -21504,8 +21608,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr "Обществени услуги"
@@ -21607,10 +21711,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr "Обществен трафик"
@@ -21630,4 +21734,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21649,4 +21760,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21970,4 +22088,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -21994,24 +22120,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr "Обществено осветление"
@@ -22043,6 +22177,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr "светла_вода"
@@ -22103,8 +22237,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr "здравеопазване"
@@ -22457,26 +22591,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr "магазин"
@@ -22531,5 +22665,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22548,8 +22682,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr "хотел"
@@ -22699,9 +22833,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr "туризъм"
@@ -22773,8 +22907,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr "исторически"
@@ -22845,8 +22979,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr "зеленина"
@@ -22860,5 +22994,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr "кариер"
@@ -22872,5 +23006,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr "сметище"
@@ -22892,5 +23026,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr "басейн"
@@ -22904,5 +23038,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr "гора"
@@ -22916,5 +23050,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr "двор ферма"
@@ -22937,5 +23071,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr "търговия на дребно"
@@ -22949,5 +23083,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr "индустрия"
@@ -22961,5 +23095,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr "индустриални развалини"
@@ -22973,5 +23107,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr "зелена площ"
@@ -22985,5 +23119,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr "ЖП"
@@ -23040,7 +23174,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr "военни"
@@ -23054,5 +23188,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr "гробище"
@@ -23065,5 +23199,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr "връх"
@@ -23078,5 +23212,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr "ледник"
@@ -23090,5 +23224,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr "вулкан"
@@ -23143,8 +23277,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr "природа"
@@ -23158,5 +23292,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr "храсталак"
@@ -23170,5 +23304,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr "пустош"
@@ -23182,5 +23316,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr "гора"
@@ -23194,5 +23328,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr "кал"
@@ -23206,5 +23340,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr "плаж"
@@ -23282,8 +23416,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr "маршрут"
@@ -23331,7 +23465,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr "граница"
@@ -23473,10 +23607,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr "място"
@@ -23524,6 +23658,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr "адрес"
@@ -23820,36 +23954,4 @@
 msgstr "Terraserver Urban"
 
-#~ msgid ""
-#~ "Failed to access system property ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "Невъзможен достъп до системната стойност ''{0}'' поради настройките за "
-#~ "сигурност. Съобщение: {1}"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Неизвестно файлово разширение."
-
-#~ msgid "An error occurred while saving. Error is: {0}"
-#~ msgstr "Възникна грешка при записа. Грешката е: {0}"
-
-#~ msgid ""
-#~ "<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-#~ "html>"
-#~ msgstr ""
-#~ "<html>Възникна грешка при въстановяването на бекъп файла.<br> Грешката е: "
-#~ "<br>{0}</html>"
-
-#~ msgid "Move"
-#~ msgstr "Преместване"
-
-#~ msgid "Invalid projection"
-#~ msgstr "Невалидна проекция"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Променете първо проекцията до {0}."
-
-#~ msgid "end"
-#~ msgstr "край"
-
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
 #~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
@@ -23911,4 +24013,7 @@
 #~ msgid "Change"
 #~ msgstr "Промени"
+
+#~ msgid "Move"
+#~ msgstr "Преместване"
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -24159,4 +24264,7 @@
 #~ msgstr "Разрешаване {0} конфликти в {1} обекти"
 
+#~ msgid "Unknown file extension."
+#~ msgstr "Неизвестно файлово разширение."
+
 #~ msgid "Some of the nodes are (almost) in the line"
 #~ msgstr "Някои от точките са (почти) на една права"
@@ -24173,4 +24281,7 @@
 #~ msgid "image not loaded"
 #~ msgstr "изображението не е заредено"
+
+#~ msgid "end"
+#~ msgstr "край"
 
 #~ msgid "Validate"
@@ -24223,4 +24334,10 @@
 #~ "Моля изберете поне една точка, път или релация. Само вече качени елементи "
 #~ "имат история."
+
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Променете първо проекцията до {0}."
+
+#~ msgid "Invalid projection"
+#~ msgstr "Невалидна проекция"
 
 #~ msgid ""
@@ -24336,2 +24453,19 @@
 #~ msgid "Missing primitive"
 #~ msgstr "Липсва примитив."
+
+#~ msgid ""
+#~ "Failed to access system property ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+#~ msgstr ""
+#~ "Невъзможен достъп до системната стойност ''{0}'' поради настройките за "
+#~ "сигурност. Съобщение: {1}"
+
+#~ msgid "An error occurred while saving. Error is: {0}"
+#~ msgstr "Възникна грешка при записа. Грешката е: {0}"
+
+#~ msgid ""
+#~ "<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
+#~ "html>"
+#~ msgstr ""
+#~ "<html>Възникна грешка при въстановяването на бекъп файла.<br> Грешката е: "
+#~ "<br>{0}</html>"
Index: /applications/editors/josm/i18n/po/cs.po
===================================================================
--- /applications/editors/josm/i18n/po/cs.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/cs.po	(revision 17069)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
-"PO-Revision-Date: 2009-08-07 09:08+0000\n"
-"Last-Translator: Jezevec <Unknown>\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
+"PO-Revision-Date: 2009-08-10 17:40+0000\n"
+"Last-Translator: fatbozz <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: 2009-08-10 11:57+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -56,6 +56,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -100,6 +100,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "Chyba"
@@ -110,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "Neuložené změny"
@@ -128,10 +128,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -148,15 +148,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -186,6 +186,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -215,5 +215,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -374,5 +374,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
 msgstr "Sloučit"
@@ -384,4 +384,6 @@
 "</html>"
 msgstr ""
+"<html>Není zde žádné vrstvy pro zdrojovou vrstvu<br>''{0}''<br>které by měly "
+"být sloučeny.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
@@ -456,9 +458,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -491,7 +493,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -578,37 +580,37 @@
 "{0} uzlů v cestě {1} překračuje nejvyšší povolený počet uzlů v cestě {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "výběr"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "stáhnout"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zvětšit na {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zvětšit pohled na {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -618,30 +620,30 @@
 msgstr "Zobrazení: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "Není zvoleno nic co by se dalo přiblížit"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "Není žádný konflikt, na který by se mohlo přiblížit"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "Spojit cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "Spojit více cest do jedné"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "Prosím zvolte minimálně dvě cesty ke spojení"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr "Spojit cesty patřící do jiné relace?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -649,13 +651,13 @@
 msgstr "Vybrané cesty patří do jiné relace. Opravdu je chcete spojit?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "Přesto zkombinovat"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "Změnit směr ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -665,10 +667,10 @@
 "orientaci?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "Otočit a zkombinovat"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -676,20 +678,20 @@
 msgstr "Zadej hodnoty pro všechny konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Vyřešit konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Kombinovat {0} cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "Všechny cesty byli prázdné"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -735,6 +737,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -756,6 +758,6 @@
 msgstr "Smazat označené objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -765,5 +767,5 @@
 msgstr "Přepsat"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -893,9 +895,10 @@
 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}''."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "Exportovat data do GPX souboru."
+msgstr "Export GPX souboru"
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -911,5 +914,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -927,5 +930,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -999,22 +1002,22 @@
 msgstr "Sloučit aktuální vrstvu do jiné vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "Spojit uzly"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "Spoj uzly do nejstaršího"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "Zvolte minimálně dva uzly ke spojení"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr "Spojit uzly s různými členství v relaci?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1023,13 +1026,13 @@
 "Zvolené uzly mají rozdílné členství v relaci. Chcete je přesto spojit ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "Přesto sloučit"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "Nemohu spojit uzly: Smazala by se tak cesta, která je stále používána."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1283,7 +1286,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "Nenalezen průsečík. Nic nebylo změněno."
+msgstr "Nenalezen žádný exportér! Nic nebylo uloženo."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1867,4 +1869,5 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr ""
+"ignoruji vyjímku, protože stahování bylo stornování. Vyjímka byla : {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
@@ -1894,5 +1897,5 @@
 msgstr "Chyby při stahování"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1909,5 +1912,5 @@
 "serveru.<br>Klikněte <strong>{2}</strong> pro ignorování.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr "Smazané nebo přesunuté prvky"
@@ -1946,11 +1949,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2089,5 +2092,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2167,5 +2170,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Hledat objekty."
@@ -2294,5 +2297,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Hledat"
@@ -2362,5 +2365,5 @@
 #, java-format
 msgid "Unexpected token: {0}"
-msgstr ""
+msgstr "Neočekávaný token: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:517
@@ -2480,5 +2483,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr ""
+msgstr "Dvojí konflikt"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
@@ -2498,5 +2501,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr "Nelze zrušit příkaz ''{0}'' protože vrstva ''{1}'' již není dostupná"
@@ -2511,5 +2514,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
 msgid "cannot resolve undecided conflict"
-msgstr ""
+msgstr "nemohu vyřešit nerozhodnutý konflikt"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109
@@ -2539,5 +2542,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr "Odstranit z relace"
@@ -2571,5 +2574,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr ""
+msgstr "Potvrďte smazání"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2579,10 +2582,10 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "Spojit {0} uzly"
-msgstr[1] "Spojit {0} uzly"
-msgstr[2] "Spojit {0} uzly"
+msgstr[0] "Přesunout uzel {0}"
+msgstr[1] "Přesunout uzly {0}"
+msgstr[2] "Přesunout uzly {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2620,10 +2623,10 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "Otočit {0} {1}"
-msgstr[1] "Otočit {0} {1}"
-msgstr[2] "Otočit {0} {1}"
+msgstr[0] "Otočit uzel {0}"
+msgstr[1] "Otočit uzly {0}"
+msgstr[2] "Otočit uzly {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2787,7 +2790,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "Změnit {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2797,5 +2800,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2844,5 +2847,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2876,5 +2879,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2889,5 +2892,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "železnice"
@@ -2902,5 +2905,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3118,9 +3121,9 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
-msgstr ""
+msgstr "WGS84 Geographic"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
 msgid "Gauss-Laborde Réunion 1947"
-msgstr ""
+msgstr "Gauss-Laborde Réunion 1947"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111
@@ -3153,22 +3156,22 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
 msgid "Swiss Grid (Switzerland)"
-msgstr ""
+msgstr "Švýcarský Grid"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
 #, java-format
 msgid "UTM Zone {0}"
-msgstr ""
+msgstr "UTM Zóna {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
 msgid "UTM20N Guadeloupe Fort-Marigot 1949"
-msgstr ""
+msgstr "UTM20N Guadeloupe Fort-Marigot 1949"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
 msgid "UTM20N Guadeloupe Ste-Anne 1948"
-msgstr ""
+msgstr "UTM20N Guadeloupe Ste-Anne 1948"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
 msgid "UTM20N Martinique Fort Desaix 1952"
-msgstr ""
+msgstr "UTM20N Martinique Fort Desaix 1952"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
@@ -3186,5 +3189,5 @@
 msgstr "Znovu nezobrazovat"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3195,5 +3198,5 @@
 "Zkontrolujte URL serveru v nastavení a vaše připojení k internetu."
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3206,10 +3209,10 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3217,25 +3220,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "neznámý"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3245,9 +3248,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr "Bezpečnostní vyjímka"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3255,10 +3258,24 @@
 "check your internet connection.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+"<html>Nepodařilo se navázat komunikaci se serverem<br>''{0}''.<br>Prosím "
+"prověřte funkčnost internetového připojení.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+msgstr "Síťová vyjímka"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "Neočekávaná výjimka"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3267,10 +3284,13 @@
 "preferences and your internet connection.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+"<html>Nepodařilo se navázat komunikaci se serverem<br>''{0}''.<br>DNS jméno "
+"''{1}'' nelze přeložit. <br>Prosím prověřte URL API ve vaší konfiguraci a "
+"vaše internetové připojení.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "Neznámé jméno počítače"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3282,5 +3302,5 @@
 "již na serveru vymazán.<br><br>Chybová zpráva je:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr "Prvek byl již smazán"
@@ -3370,10 +3390,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "Jméno uživatele"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "Heslo"
@@ -3577,15 +3597,15 @@
 msgstr "(žádný objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "vrstva není v seznamu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Vrstva ''{0}'' musí být v  seznamu vrstev"
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3639,34 +3659,34 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
-msgstr ""
+msgstr "Můj s cizím"
 
 #. *
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
-msgstr ""
+msgstr "Můj se sloučeným"
 
 #. *
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+msgstr "Cizí se sloučeným"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3676,6 +3696,6 @@
 msgstr "Značky"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3683,6 +3703,6 @@
 msgstr "Body"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3690,40 +3710,40 @@
 msgstr "Členové"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+msgstr "Nezbývají žádné další konflikty značek k vyřešení"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+msgstr "Značky({0} konfliktů)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+msgstr "Zbývá {0} konfliktů značek k vyřešení"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+msgstr "Body(vyřešeno)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+msgstr "Body(s konflikty)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+msgstr "Nevyřešené konflikty v seznamu bodů v této cesty"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+msgstr "Členové(vyřešeno)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3731,74 +3751,74 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "Členi (s konflikty)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+msgstr "Nevyřešené konflikty v seznamu členů této relace"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+msgstr "Nezbývají žádné konflikty ve vlastnostech"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "Vlastnosti (s konflikty)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+msgstr "Zbývající konflikty k vyřešení ve vlastnostech"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "Řešení konfliktů"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+msgstr "aktuální parametr je mimo rozsah: zadáno {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr "neočekávaná hodnota parametru \"index\". Zadáno {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr "položka {0} nenalezena v seznamu"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr "Porovnat "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr "Má verze"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr "Seznam prvků v mé datové sadě, např v lokální datové sadě"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr "Sloučená verze"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3806,30 +3826,30 @@
 msgstr "Seznam sloučených elementů. Nahradí mé elementy po potvrzení sloučení."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr "Cizí verze"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr "Seznam prvků v cizí datové sadě, např v serverové datové sadě"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr "> vrchol"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr "Kopírovat mé vybrané body na začátek seznamu slučovaných bodů"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr "> spodek"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr "Kopírovat mé vybrané elementy na konec seznamu slučovaných elementů"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3837,5 +3857,5 @@
 msgstr "Kopírovat mé vybrané elementy na začátek seznamu slučovaných elementů"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3845,14 +3865,14 @@
 "elementů"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
 "Kopírovat cizí vybrané elementy na začátek seznamu slučovaných elementů"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 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/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3862,5 +3882,5 @@
 "elementů"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3870,21 +3890,21 @@
 "elementů"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr "Nahoru"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr "Posunout vybrané elementy o jednu pozici nahoru"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr "Dolu"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr "Posunout vybrané elementy o jednu pozici dolu"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3893,27 +3913,27 @@
 msgstr "Odstranit"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr "Odstranit vybrané položky ze seznamu slučovaných elementů"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr "Blokovat"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr "Blokovat aktuání seznam slučovaných elementů"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr "Odblokovat"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr "Odblokovat aktuání seznam slučovaných elementů"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3923,5 +3943,5 @@
 "položek</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3932,5 +3952,5 @@
 "položek</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3940,5 +3960,5 @@
 msgstr[2] "Má verze ({0} položek)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3948,5 +3968,5 @@
 msgstr[2] "Sloučená verze ({0} položek)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -3956,21 +3976,21 @@
 msgstr[2] "Cizí verze ({0} položek)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -3980,5 +4000,5 @@
 msgstr "parametr '{0}' nesmí být null (prázdný)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -3988,5 +4008,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -3994,19 +4014,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr "Bod"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr "neočekávaný index sloupce. Zadáno {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -4015,19 +4035,19 @@
 msgstr "<html>Při komunikaci se serverem doslo k chybě<br>Detaily: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr "Komunikace se serverem selhala"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr "Ano, obnovit je také"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr "Ne, zruš operaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -4038,9 +4058,9 @@
 "serveru.<br><br>Chcete obnovit také tyto body?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr "Obnovit další body?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -4052,13 +4072,13 @@
 "na serveru.<br><br>Chcete je obnovit také?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr "Obnovit závislé prvky?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr "Vlastnosti v mé datové sadě, např lokální datové sadě"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -4068,90 +4088,90 @@
 "sloučení aplikováno."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr "Vlastnosti v cizí datové sadě, např serverová datová sada"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr "Souřadnice:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr "Stav smazáno:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr "Stav viditelné:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr "(žádný)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "smazáno"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr "nesmazáno"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr "viditelný (na serveru)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr "neviditelný (na serveru)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr "Ponechat klon lokální verze"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr "Fyzicky odstranit z lokální datové sady"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr "Ponechat mé souřadnice"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr "Ponechat cizí souřadnice"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr "Nerozhodnutý konflikt rozdílných souřadnic"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr "Ponechat můj stav vymazáno"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr "Ponechat cizí stav vymazáno"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr "Nerozhodnutý konflikt stavu vymazáno"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr "Ponechat můj stav viditelné"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr "Ano, resetovat id"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr "Ne, zrušit"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4164,17 +4184,17 @@
 "<br>Souhlasíte s tím?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr "Resetovat id na 0"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr "Ponechat cizí stav viditelné"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr "Ano, vyčistit to"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4185,14 +4205,14 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr "Odstranit z datové sady"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr "Nerozhodnutý konflikt stavu viditelné"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4200,21 +4220,21 @@
 msgstr "Role"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr "Prvek"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr "sloučené body nejsou dosud zmražené. Nelze vytvořit příkaz pro řešení"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4222,14 +4242,14 @@
 msgstr "<nedefinováno>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr "Sloučená datová sada nebude obsahovat tag s klíčem {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4237,7 +4257,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4249,7 +4269,7 @@
 msgstr "Klíč"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4262,45 +4282,45 @@
 msgstr "Hodnota"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr "nelze aplikovat nerozhodnutou položku slučování tagů"
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr "Parametr 'col'  musí být 0 nebo 1. Zadáno {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr "Má verze (lokální datová sada)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr "Cizí verze (serverová datová sada)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ">"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Ponechat vybrané páry klíč/hodnota z lokální datové sady"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr "Ponechat vybrané páry klíč/hodnota ze serverové datové sady"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr "Nerozhodnuto"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr "Označit vybrané tagy jako nerozhodnuté"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4320,8 +4340,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4360,5 +4380,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4413,5 +4433,5 @@
 #, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr ""
+msgstr "Vyřešit konflikty pro ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4460,83 +4480,83 @@
 msgstr "Zobrazit historii vybraného prvku"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "Vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "Otevřít seznam všech nahraných vrstev."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "Smazat označenou vrstvu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr "Ve vrstvě ''{0}'' jsou neuložené změny. Chcete vrstvu skutečně smazat?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr "Smazat vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr "Opravdu chcete smazat vrstvu ''{0}''?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr "Potvrzení"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr "Ano"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr "Ne"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr "Smazat vše"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr "Mazání vrstvy {0} z {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "Zobrazit/Skrýt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "Přepnout viditelnost zvolené vrstvy."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
 msgid "Activate"
 msgstr "Aktivovat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate the selected layer"
 msgstr "Aktivovat vybranou vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr "Sloučit tuto vrstvu do jiné vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "Přesunout zvolenou vrstvu o řádek nahoru."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "Přesunout zvolenou vrstvu o řádek dolů."
@@ -4546,6 +4566,6 @@
 msgstr "Informace o vrstvě"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4555,22 +4575,22 @@
 msgstr[2] "Toto změní až  {0} objektů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "Prázdná hodnota smaže klíč"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<různé>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "Změnit hodnoty ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4578,5 +4598,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4586,40 +4606,40 @@
 msgstr[2] "Změnit vlastnosti až  {0} objektů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "Prosím zvolte klíč"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "Vyberte prosím hodnotu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 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/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "Vlastnosti/Členství"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "Vlastnosti pro zvolené objekty"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "Člen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "Přidat vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4636,39 +4656,39 @@
 msgstr "Přidat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 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/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "Upravit vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 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/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Vlastnosti: {0} / Členství: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "Vlastnosti / Členství"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "Změnit relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, 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/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "Smaže zvolený klíč ve všech objektech"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "Smazat vlastnosti"
@@ -4680,5 +4700,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "Relace"
@@ -4708,33 +4728,33 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
 msgid "Create a copy of this relation and open it in another editor window"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+msgstr "Vytvořit kopii relace a otevřít ji v novém okně"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "Současný výběr"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "Otevřít okno s výběrem."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "Přiblížit na zvolené prvky"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "Obnovit výběr"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "Přiblížit na výběr"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Výběr: Rel.:{0} / Cest:{1} / Uzlů:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4742,5 +4762,5 @@
 msgstr "Výběr"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4750,5 +4770,5 @@
 msgstr[2] "{0} cest"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4758,5 +4778,5 @@
 msgstr[2] "{0} relací"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -4886,5 +4906,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
-msgstr ""
+msgstr "Role:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
@@ -4894,13 +4914,16 @@
 "<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 "
+"relaci.<br>To vyváří cyklické závislosti a není to doporučeno.<br>Co chcete "
+"provést s touto cyklickou závislostí?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr ""
+msgstr "Odstranit, vyčistit relaci"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
-msgstr ""
+msgstr "Ignorovat, ponechat relaci jak je"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
@@ -4911,4 +4934,6 @@
 "html>"
 msgstr ""
+"<html>Relace již obsahuje minimálně jeden prvek odkazující na<br>prvek "
+"''{0}''<br><br>Opravdu chcete přidat dalšího člena relace?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
@@ -4967,5 +4992,5 @@
 msgid ""
 "Select relation members which refer to primitives in the current selection"
-msgstr ""
+msgstr "Vybrat členy relace odkazující na prvky v aktuálním výběru"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
@@ -4974,10 +4999,9 @@
 "Select relation members which refer to {0} primitives in the current "
 "selection"
-msgstr ""
+msgstr "Vybrat členy relace odkazující na {0} prvků v aktuálním výběru"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "Smazat vybrané relace"
+msgstr "Vybrat prvky pro vybrané členy relace"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -5038,5 +5062,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr ""
+msgstr "Konflikt v datech"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
@@ -5049,16 +5073,16 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr ""
+msgstr "Aplikovat aktuální změny"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
-msgstr ""
+msgstr "Aplikovat"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
-msgstr ""
+msgstr "Aplikovat změny a zavřít dialog"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5072,13 +5096,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
-msgstr ""
+msgstr "Zrušit změny a zavřít dialog"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
-msgstr ""
+msgstr "Přidat prázdnou značku"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
-msgstr ""
+msgstr "Smazat vybrané značky"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
@@ -5092,13 +5116,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
-msgstr ""
+msgstr "Editor relací: Stáhnout členy"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
-msgstr ""
+msgstr "Nastaví roli pro vybrané členy"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
-msgstr ""
+msgstr "Aplikovat roli"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
@@ -5109,45 +5133,47 @@
 "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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
-msgstr ""
+msgstr "Ano, aplikovat"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
-msgstr ""
+msgstr "Ne, neaplikovat"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
-msgstr ""
+msgstr "Potvrdit prázdnou roli"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
 msgid "Zoom to"
-msgstr ""
+msgstr "Zvětšit na"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
 msgid "Zoom to primitive the first selected member refers to"
-msgstr ""
+msgstr "Zvětšit na prvek odkazovaný prvním členem výběru"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
 msgid "Zooming disabled because layer of this relation is not active"
-msgstr ""
+msgstr "Zvětšování je neaktivní protože je neaktivní vrstva s touto relací"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225
 msgid "Zooming disabled because there is no selected member"
-msgstr ""
+msgstr "Zvětšování je neaktivní protože nebyl vybrán žádný člen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24
 msgid "Refers to"
-msgstr ""
+msgstr "Odkazuje na"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32
 msgid "Linked"
-msgstr ""
+msgstr "Spojený"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
 msgid "Download referring relations"
-msgstr ""
+msgstr "Stáhnout odkazované relace"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
@@ -5158,13 +5184,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78
 msgid "including immediate children of parent relations"
-msgstr ""
+msgstr "včetně přímých potomků rodičovské relace"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
 msgid "Load parent relations"
-msgstr ""
+msgstr "Načíst rodičovské relace"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157
 msgid "Edit the currently selected relation"
-msgstr ""
+msgstr "Upravit vybranou relaci"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
@@ -5189,14 +5215,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
 msgid "Load relation"
-msgstr ""
+msgstr "Načíst relaci"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
 msgid "Warning: ignoring exception because task was cancelled. Exception was: "
-msgstr ""
+msgstr "Varovaní: ignoruji výjimku protože úloha byla přerušena. Výjimka: "
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
 msgid "<multiple>"
-msgstr ""
+msgstr "<mnohonásobný>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351
@@ -5223,5 +5249,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 msgid "Name of location"
-msgstr ""
+msgstr "Jméno lokace"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -5298,5 +5324,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "Místa"
@@ -5343,21 +5369,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "typ"
@@ -6160,72 +6186,519 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "Název"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+"<html>Verze <strong>{0}</strong> vytvořená na <strong>{1}</strong> "
+"uživatelem <strong>{2}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr "Verze {0} vytvořená na {1} uživatelem {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr "Verze"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr "Obrázky pro {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr "Číst GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Žádný čas pro bod {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Nelze přečíst čas \"{0}\" z bodu {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr "Nebyli nalezeny žádné obrázky s čitelnou časovou značkou."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "Čtu {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr "Obrázky s GPS souřadnicemi"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr "Start GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr "Konec GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr "nynější odchylka: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr "rozdíl časových pásem: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "obrázek"
+msgstr[1] "obrázky"
+msgstr[2] "obrázky"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "Synchronizovat hodiny"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG obrázky (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Data v souboru \"{0}\" nemohla být parsována."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "V souboru \"{0}\" není časová značka EXIF"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "Obrázek"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Zadejte datum ve tvaru (mm/dd/rrrr HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr "časové pásmo GPS jednotky (rozdíl oproti forografii)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr "Synchronizace času s GPS přijímačem"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr "Zadaný čas nemůže být rozparsován"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr "gps bod"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "Přizpůsobit kreslení linií"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr "Použít globální nastavení."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr "Kreslit spojnice mezi body v této vrstvě"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr "Nereslit spojnice mezi body v této vrstvě"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "Přizpůsobit barvu"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Výchozí"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Zvolit barvu"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr "Značky z pojmenovaných bodů"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Pojmenované body z {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "Importovat zvuk"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave Audiosoubory (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Audio značky z {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "Importovat obrázky"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} cest, "
+msgstr[1] "{0} cesta, "
+msgstr[2] "{0} cesty, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} trasa, "
+msgstr[1] "{0} trasy, "
+msgstr[2] "{0} trasy, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} značka"
+msgstr[1] "{0} značky"
+msgstr[2] "{0} značek"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr "Jméno: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr "Popis: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr "Časové rozpětí: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr "Délka: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "Převést do datové vrstvy"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+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:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Převedeno z: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr "Stáhnout data z OSM podél této trasy"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr "Stáhnout vše v rozmezí:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr "{0} metrů"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr "Maximální plocha na požadavek:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} čtverečních km"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Tato akce bude potřebovat<br>{0} samostatných stažení dat.<br>Chcete "
+"pokračovat?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr "Není dostupná žádná GPX trasa pro kterou by šel asociovat zvuk."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Některé značky, které byly příliš daleko od trasy k rozumnému odhadu času, "
+"byly vynechány."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Datová vrstva {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr "mimo stažený areál"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr "verze {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+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"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} se skládá z:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} smazáno.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr "nenastaveno"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr "Verze API: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr "Převédst do GPX vrstvy"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6234,7 +6707,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6244,452 +6717,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "Název"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-"<html>Verze <strong>{0}</strong> vytvořená na <strong>{1}</strong> "
-"uživatelem <strong>{2}</strong></html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr "Verze {0} vytvořená na {1} uživatelem {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr "Verze"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr "Obrázky pro {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr "Číst GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Žádný čas pro bod {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Nelze přečíst čas \"{0}\" z bodu {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr "Nebyli nalezeny žádné obrázky s čitelnou časovou značkou."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Čtu {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr "Obrázky s GPS souřadnicemi"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr "Start GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr "Konec GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr "nynější odchylka: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr "rozdíl časových pásem: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "obrázek"
-msgstr[1] "obrázky"
-msgstr[2] "obrázky"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "Synchronizovat hodiny"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG obrázky (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Data v souboru \"{0}\" nemohla být parsována."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "V souboru \"{0}\" není časová značka EXIF"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "Obrázek"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Zadejte datum ve tvaru (mm/dd/rrrr HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr "časové pásmo GPS jednotky (rozdíl oproti forografii)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr "Synchronizace času s GPS přijímačem"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr "Zadaný čas nemůže být rozparsován"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr "gps bod"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "Přizpůsobit kreslení linií"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "Použít globální nastavení."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr "Kreslit spojnice mezi body v této vrstvě"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr "Nereslit spojnice mezi body v této vrstvě"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "Přizpůsobit barvu"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Výchozí"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Zvolit barvu"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr "Značky z pojmenovaných bodů"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Pojmenované body z {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "Importovat zvuk"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave Audiosoubory (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Audio značky z {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "Importovat obrázky"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} cest, "
-msgstr[1] "{0} cesta, "
-msgstr[2] "{0} cesty, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} trasa, "
-msgstr[1] "{0} trasy, "
-msgstr[2] "{0} trasy, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} značka"
-msgstr[1] "{0} značky"
-msgstr[2] "{0} značek"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr "Jméno: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr "Popis: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr "Časové rozpětí: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr "Délka: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "Převést do datové vrstvy"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-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:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Převedeno z: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr "Stáhnout data z OSM podél této trasy"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr "Stáhnout vše v rozmezí:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr "{0} metrů"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr "Maximální plocha na požadavek:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} čtverečních km"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Tato akce bude potřebovat<br>{0} samostatných stažení dat.<br>Chcete "
-"pokračovat?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr "Není dostupná žádná GPX trasa pro kterou by šel asociovat zvuk."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Některé značky, které byly příliš daleko od trasy k rozumnému odhadu času, "
-"byly vynechány."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Datová vrstva {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr "mimo stažený areál"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr "verze {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-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"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} se skládá z:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} smazáno.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr "nenastaveno"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr "Verze API: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr "Převédst do GPX vrstvy"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -6756,4 +6782,5 @@
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr ""
+"Audio je třeba pozastavit v okamžiku, kdy uslyšíte synchronizační impuls."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
@@ -6969,5 +6996,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
 msgid "Fast forward multiplier"
-msgstr ""
+msgstr "Násobič rychlého přehrávání"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
@@ -7067,5 +7094,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "Auto"
@@ -7082,16 +7109,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "Cyklisté"
@@ -7119,14 +7148,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "Pěší"
@@ -7185,5 +7217,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
 msgid "Maximum length for local files (meters)"
-msgstr ""
+msgstr "Maximální délka lokálních souborů (v metrech)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
@@ -7340,19 +7372,19 @@
 msgstr "Jazyk"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr "Povolit vestavěné výchozí hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
-msgstr ""
+msgstr "Povolit vestavěné standarní ikony"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+msgstr "Styly kreslení mapy"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr "Použitý styl"
@@ -7383,5 +7415,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93
 msgid "Enter URL"
-msgstr ""
+msgstr "Zadat URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
@@ -7481,39 +7513,11 @@
 msgstr "Heslo pro proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Základní URL OSM serveru (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr "Přihlašovací jméno (e-mail) k účtu OSM."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"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."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "URL serveru"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr "Uživatelské jméno (e-mail)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "OSM heslo"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
-"<html>VAROVÁNÍ: Heslo je uloženo jako běžný text v konfiguračním souboru."
-"<br>Heslo je jako text přenášeno na server a je součástí URL."
-"<br><b>Nepoužívejte hesla která chcete utajit.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -7865,7 +7869,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "Nemůžu číst \"{0}\""
+msgstr "Nemohu exportovat \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -7970,7 +7974,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "Neznámá role ''{0}''."
+msgstr "Neznámý režim {0}."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8009,4 +8013,6 @@
 "for each primitive"
 msgstr ""
+"Server odpověděl chybovým kódem 404, opakování s individuálním požadavkem "
+"pro každý prvek"
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22
@@ -8069,5 +8075,5 @@
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
-msgstr ""
+msgstr "neočekávaný formát id získaný ze serveru, získáno ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
@@ -8076,4 +8082,5 @@
 "unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
 msgstr ""
+"neočekávaný formát nové verze modifikovaného prvku ''{0}'', zadáno ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286
@@ -8087,5 +8094,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327
 msgid "No changeset present for diff upload"
-msgstr ""
+msgstr "Není k dizpozici sada změn pro rozdílový upload"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334
@@ -8099,14 +8106,14 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361
 msgid "Waiting 10 seconds ... "
-msgstr ""
+msgstr "Čekám 10 sekund ... "
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369
 msgid "OK - trying again."
-msgstr ""
+msgstr "OK - další pokus."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
 #, java-format
 msgid "Starting retry {0} of {1}."
-msgstr ""
+msgstr "Zahajuji pokus {0} z {1}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -8131,23 +8138,51 @@
 msgstr "poškozený bz2 soubor."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "Nesprávné heslo nebo uživatelské jméno"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Upozornění: heslo je posíláno nezašifrované."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "Uložit uživatelské jméno a heslo (nezašifrované)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "Zadejte heslo"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
 msgstr "Přihlásit se"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr "Přihlašovací jméno (e-mail) k účtu OSM."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"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."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr "Uživatelské jméno (e-mail)"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "OSM heslo"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
+"<html>VAROVÁNÍ: Heslo je uloženo jako běžný text v konfiguračním souboru."
+"<br>Heslo je jako text přenášeno na server a je součástí URL."
+"<br><b>Nepoužívejte hesla která chcete utajit.</b></html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -8235,5 +8270,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214
 msgid "Parsing OSM history data ..."
-msgstr ""
+msgstr "Parsuji data historie OSM ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38
@@ -8318,14 +8353,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "Neznámý typ prvku pro ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "Připravuji OSM data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr "Neplatné id uzlu"
@@ -8343,9 +8378,9 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
-msgstr ""
+msgstr "Stahování odkazovaných cest ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181
 msgid "Downloading referring relations ..."
-msgstr ""
+msgstr "Stahování odkazovaných relací ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -8539,9 +8574,9 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306
 msgid "The plugin could not be removed. Probably it was already disabled"
-msgstr ""
+msgstr "Plugin nelze odstranit. Pravděpodobně je již neaktivní."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
 msgid "Plugin information"
-msgstr ""
+msgstr "Informace o pluginu"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -8569,5 +8604,5 @@
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
-msgstr ""
+msgstr "Plug-in {0} je nedostupný. Aktualizace přeskočena."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
@@ -8780,5 +8815,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr "Popis"
@@ -8850,5 +8885,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
-msgstr ""
+msgstr "AgPifoJ - obrázky s geoznačkami"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
@@ -9192,5 +9227,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr "Chyba při nahrávání souboru"
@@ -9433,5 +9468,4 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
-#, fuzzy
 msgid ""
 "To enable the cadastre WMS plugin, change\n"
@@ -9439,6 +9473,4 @@
 "projection and retry"
 msgstr ""
-"Pro použití katastrálního WMS pluginu, změňte projekci na Lambertovu a "
-"restartujte JOSM"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9531,5 +9563,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -10072,7 +10104,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr "voda"
@@ -10257,7 +10289,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "jméno"
+msgstr "beze jména"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10422,4 +10453,5 @@
 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"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
@@ -10496,5 +10528,5 @@
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56
 msgid "No view open - cannot determine boundaries!"
-msgstr ""
+msgstr "Neotevřen žádný pohled - nelze určit hranice!"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109
@@ -10770,5 +10802,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 msgid "AutoSave LiveData"
-msgstr ""
+msgstr "Automatické ukládání LiveData"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -10824,12 +10856,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "start"
+msgstr "{0} začátek"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0} uzel"
+msgstr "{0} konec"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -10901,14 +10933,14 @@
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
 msgid "Tagging Preset Tester"
-msgstr ""
+msgstr "Tester předvoleb značení"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
-msgstr ""
+msgstr "Otevřít nástroj pro testovaní dialogů přednastavených značek."
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
 msgid "You have to specify tagging preset sources in the preferences first."
-msgstr ""
+msgstr "Je třeba zadat zdroje předvoleb v konfiguraci."
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
@@ -10968,5 +11000,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr "Jméno ulice"
@@ -10999,5 +11031,5 @@
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:113
 msgid "Replaces Selection with Users data"
-msgstr ""
+msgstr "Nahradí výběr uživatelskými daty"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:148
@@ -11062,5 +11094,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:181
 msgid "No intersection found. Nothing was changed."
-msgstr ""
+msgstr "Nenalezen žádný průnik. Nic se nemění."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:203
@@ -11094,5 +11126,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317
 msgid "Fix tag conflicts"
-msgstr ""
+msgstr "Opravit konflikty značek"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:465
@@ -11224,9 +11256,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
 msgid "Show informational level on upload."
-msgstr ""
+msgstr "Zobrazovat informační zprávy při nahrávání."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show the informational tests in the upload check windows."
-msgstr ""
+msgstr "Zobrazovat informační testy v oknech kontroly nahrávání."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
@@ -11524,9 +11556,9 @@
 #, java-format
 msgid "Key ''{0}'' not in presets."
-msgstr ""
+msgstr "Klíč ''{0}'' není v předvolbách."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
-msgstr ""
+msgstr "Předvolby neobsahují vlastnost klíč"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
@@ -11537,9 +11569,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
-msgstr ""
+msgstr "Předvolby neobsahují vlastnost hodnota"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
-msgstr ""
+msgstr "OPRAVY"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
@@ -11565,5 +11597,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
 msgid "TagChecker source"
-msgstr ""
+msgstr "zdroj TagCheckeru"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
@@ -11795,7 +11827,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr "budova"
@@ -11809,5 +11841,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr "oblast"
@@ -12062,12 +12094,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "Zvolte řádek k editaci"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "Uložit WMS vrstvu"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
@@ -12080,7 +12110,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "Žádné změny k nahrání."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -12093,19 +12122,19 @@
 "Toto může vést ke špatným souřadnicím."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr "Automatické stahování"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS vrstva ({0}), automatické stahování v přiblížení {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS vrstva ({0}), stahování v přiblížení {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -12113,42 +12142,42 @@
 "Požadovaná plocha je příliš velká. Přibližte pohled nebo změňte rozlišení."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr "Nahrát viditelné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr "Změnit rozlišení"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr "Znovu nahrát chybné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr "Alfa kanál"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr "Uložit WMS vrstvu do souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr "Uložit WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr "Nahrát WMS vrstvu ze souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr "Načíst vrstvu WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Nepodporovaná verze WMS souboru; nalezeno {0}, očekáváno {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr "Chyba formátu souboru"
@@ -12512,4 +12541,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12546,5 +12577,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr "Ulice"
@@ -12555,5 +12586,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Dálnice"
@@ -12562,5 +12593,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr "Upravit dálnici"
@@ -12587,8 +12618,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr "Číslo"
@@ -12629,21 +12660,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr "Vrstva"
@@ -12657,8 +12688,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr "Jízdních pruhů"
@@ -12676,15 +12707,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr "Max. rychlost (km/h)"
@@ -12721,16 +12752,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr "Jednosměrka"
@@ -12772,19 +12803,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Most"
@@ -12820,19 +12851,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr "Tunel"
@@ -12866,18 +12897,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr "Zářez"
@@ -12911,18 +12942,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr "Násep"
@@ -12930,5 +12961,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr "Dálnice - nájezd, rampa, kolektor"
@@ -12937,5 +12968,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr "Upravit dálniční spojku"
@@ -12943,5 +12974,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr "4. pruhová silnice"
@@ -12950,5 +12981,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr "Upravit 4. pruhovou silnice"
@@ -12958,6 +12989,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr "Silnice pro motorová vozidla"
@@ -12965,5 +12996,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr "4. pruhová silnice - nájezd"
@@ -12972,5 +13003,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr "Upravit 4. pruhovou silnici - nájezd"
@@ -12983,5 +13014,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Silnice 1. třídy"
@@ -12990,5 +13021,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr "Upravit silnici 1. třídy"
@@ -12996,10 +13027,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr "Silnice 1. třídy - nájezd"
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr "Upravit spojku silnice 1. třídy"
@@ -13011,5 +13042,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Silnice 2. třídy"
@@ -13019,5 +13050,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr "Upravit silnici 2. třídy"
@@ -13025,5 +13056,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr "Silnice 3. třídy"
@@ -13033,5 +13064,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr "Upravit silnici 3. třídy"
@@ -13043,5 +13074,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Místní silnice"
@@ -13051,5 +13082,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr "Upravit místní silnici"
@@ -13076,19 +13107,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr "Šířka (metrů)"
@@ -13100,5 +13131,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Ulice"
@@ -13107,5 +13138,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr "Upravit ulici"
@@ -13129,13 +13160,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr "Povrch"
@@ -13155,20 +13186,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr "zpevněný"
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr "nezpevněný"
@@ -13176,12 +13207,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr "dlažební kostky"
@@ -13189,5 +13220,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr "Obytná zóna"
@@ -13196,5 +13227,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr "Upravit obytnou zónu"
@@ -13202,5 +13233,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr "Účelová komunikace"
@@ -13209,5 +13240,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr "Upravit účelovou komunikaci"
@@ -13217,18 +13248,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr "Typ účelové komunikace"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr "ulička"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr "příjezdová cesta"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr "Obslužná silnice na parkovišti"
@@ -13236,5 +13267,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr "Obslužná silnice na parkovišti"
@@ -13244,5 +13275,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr "Editovat obslužnou silnici na parkovišti"
@@ -13250,5 +13281,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr "Cesta (neznámý typ)"
@@ -13257,5 +13288,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr "Upravit cestu neznámého typu"
@@ -13264,20 +13295,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr "Silniční omezení"
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr "Upravit silniční omezení"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr "Poplatek"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr "Slepá ulice"
@@ -13290,8 +13321,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr "Přístup"
@@ -13335,23 +13366,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr "ano"
@@ -13364,40 +13395,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr "soukromý"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr "vyhrazený(preferovaný)"
@@ -13410,19 +13441,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr "dopravní obsluha"
@@ -13445,65 +13476,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr "na povolení"
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr "zemědelská vozidla"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr "ne"
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr "Zásobování"
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Nákladní vozidlo"
@@ -13518,10 +13549,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr "Kůň"
@@ -13537,13 +13568,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr "Motocykl"
@@ -13559,30 +13590,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr "Motorové vozidlo"
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr "Vozidla MHD"
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr "Motorová loď"
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr "Loď"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr "Min. rychlost (km/h)"
@@ -13590,25 +13621,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr "Max. hmotnost (tun)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr "Max. výška (metrů)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr "Max. šířka (metrů)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr "Max. délka (metrů)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr "Kruhový objezd"
@@ -13619,5 +13650,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr "Upravit křižovatku"
@@ -13639,9 +13670,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr "Typ"
@@ -13661,10 +13692,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr "dálnice"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr "Dálnice - nájezd"
@@ -13686,10 +13717,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr "4. pruhová silnice"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr "4. pruhová silnice - nájezd"
@@ -13711,10 +13742,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr "silnice první třídy"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr "Silnice 1. třídy - nájezd"
@@ -13736,6 +13767,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr "silnice druhé třídy"
@@ -13749,9 +13780,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr "silnice třetí třídy"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr "silnice bez klasifikace"
@@ -13765,9 +13796,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr "obytná oblast"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr "obytná zóna"
@@ -13797,10 +13828,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr "obslužná cesta"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr "Autobusová dráha"
@@ -13808,4 +13839,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13823,6 +13861,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr "konstrukce"
@@ -13833,10 +13871,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr "Edituj most"
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr "Upravit tunel"
@@ -13844,19 +13882,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr "Cesty"
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr "Výstavba, plánovaná výstavba (Construction)"
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr "Upravit silnici ve stavbě"
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr "Križovatka"
@@ -13872,5 +13910,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr "kruhový objezd"
@@ -13879,5 +13917,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr "Cesta pro koně"
@@ -13885,5 +13923,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr "Upravit cestu pro koně"
@@ -13891,5 +13929,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr "Cyklostezka"
@@ -13899,5 +13937,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr "Upravit cyklostezku"
@@ -13905,5 +13943,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr "Chodník, stezka"
@@ -13912,5 +13950,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr "Upravit chodník nebo stezku"
@@ -13918,5 +13956,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr "Pěší zóna"
@@ -13925,5 +13963,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr "Upravit pěší zónu"
@@ -13931,5 +13969,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr "Schody"
@@ -13939,5 +13977,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr "Upravit schody"
@@ -13946,5 +13984,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr "Vozová cesta (track)"
@@ -13953,14 +13991,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr "Upravit vozovou cestu"
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr "beton"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr "štěrk"
@@ -13968,18 +14006,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr "země"
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr "tráva"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr "písek"
@@ -13987,5 +14025,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr "Vozová cesta stupně 1 (zpevněná)"
@@ -13994,5 +14032,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr "Upravit vozovou cestu stupně 1 (zpevněnou)"
@@ -14000,5 +14038,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr "Vozová cesta stupně 2"
@@ -14007,5 +14045,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr "Upravit vozovou cestu stupně 2"
@@ -14013,5 +14051,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr "Vozová cesta stupně 3"
@@ -14020,5 +14058,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr "Upravit vozovou cestu stupně 3"
@@ -14026,5 +14064,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr "Vozová cesta stupně 4"
@@ -14033,5 +14071,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr "Upravit vozovou cestu stupně 4"
@@ -14039,5 +14077,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr "Vozová cesta stupně 5 (nejhorší)"
@@ -14046,5 +14084,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr "Upravit vozovou cestu stupně 5 (nejhorší)"
@@ -14053,5 +14091,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr "Cesta vychozená v terénu pro cyklo/pěší (path)"
@@ -14060,13 +14098,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr "Upravit cestu"
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr "Sněžný skůtr"
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr "Lyže"
@@ -14074,5 +14112,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr "turistická stezka"
@@ -14082,5 +14120,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr "Editovat turistickou stezka"
@@ -14088,5 +14126,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr "horská turistická stezka"
@@ -14096,5 +14134,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr "Editovat horskou stezka"
@@ -14102,5 +14140,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr "Náročná horská stezka"
@@ -14110,5 +14148,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Editovat náročnou horskou stezku"
@@ -14116,5 +14154,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr "Vysokohorská stezka"
@@ -14124,5 +14162,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr "Editovat vysokohorskou stezku"
@@ -14130,5 +14168,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr "Náročná vysokohorská stezka"
@@ -14138,5 +14176,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Editovat náročnou vysokohorskou stezku"
@@ -14144,5 +14182,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr "Obtížná vysokohorská stezka"
@@ -14152,5 +14190,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Upravit obtížnou vysokohorskou stezku"
@@ -14158,10 +14196,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr "Silniční body"
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr "Dálniční sjezd (exit)"
@@ -14169,15 +14207,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr "Upravit křižovatku dálnic"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr "Číslo"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr "Služby motoristům (odpočívadla)"
@@ -14185,5 +14223,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr "Upravit služby motoristům (odpočívadla)"
@@ -14218,14 +14256,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr "Operátor"
@@ -14234,5 +14272,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr "Semafory"
@@ -14242,5 +14280,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr "Typ přechodu pro chodce"
@@ -14249,27 +14287,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr "volný"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr "světelná signalizace"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr "ostrov"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr "neoznačený"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr "Přechod na koni"
@@ -14277,6 +14315,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr "Přechod na kole"
@@ -14285,11 +14323,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr "Dohled nad přechodem"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr "Typ přechodu (UK)"
@@ -14297,30 +14335,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr "zebra (bez semaforů)"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr "pelikán (se semafory)"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr "tukan (se semafory a tlačítkem pro chodce a cyklisty)"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr "papuchalk"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr "pegas (se semafory a tlačítkem pro chodce, cyklisty a jezdce na koni)"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr "tygr"
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr "Stop"
@@ -14328,5 +14366,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr "Přechod pro chodce"
@@ -14335,14 +14373,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr "Upravit přechod"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr "Jméno typu (UK)"
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr "Malý kruhový objezd"
@@ -14353,14 +14391,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr "Směr"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr "po směru hodinových ručiček"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr "Obratiště"
@@ -14370,20 +14408,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr "Hranice města/obce"
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr "Upravit značku hranice města/obce"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr "Druhé jméno"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr "Rychlostní radar"
@@ -14391,5 +14429,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr "Nouzový telefon"
@@ -14397,5 +14435,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr "Stoupání"
@@ -14403,5 +14441,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr "Prudké stoupání"
@@ -14410,10 +14448,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr "Brod"
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr "Upravit brod"
@@ -14421,5 +14459,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr "Horský průsmyk"
@@ -14427,5 +14465,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr "Upravit horský průsmyk"
@@ -14437,7 +14475,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr "Nadmořská výška"
@@ -14445,5 +14483,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr "Bariéry"
@@ -14451,5 +14489,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr "Sloupek"
@@ -14457,5 +14495,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr "Upravit sloupek"
@@ -14494,18 +14532,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr "Povolený provoz:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr "Zábrana proti kolům"
@@ -14514,5 +14556,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr "Zátarasa"
@@ -14520,5 +14562,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr "Mříž proti dobytku"
@@ -14526,10 +14568,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr "Editovat mříž proti dobytku"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr "Zábrana průjezdná pouze autobusem"
@@ -14537,15 +14579,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr "Jednosměrné hroty"
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr "Editovat jednosměrné hroty"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr "Mýtná budka"
@@ -14553,5 +14595,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr "Upravit mýtnou budku"
@@ -14559,10 +14601,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr "Hraniční kontrola"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr "Upravit hraniční kontrolu"
@@ -14572,5 +14614,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr "Živý plot"
@@ -14579,5 +14621,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr "Plot"
@@ -14586,5 +14628,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr "Zeď"
@@ -14592,5 +14634,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr "Městské hradby"
@@ -14599,5 +14641,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr "Opěrná zeď"
@@ -14609,15 +14651,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr "Vstup"
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr "Upravit vstup"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr "Brána"
@@ -14625,50 +14667,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr "Editovat bránu"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr "Závora"
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr "Upravit závoru"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr "Odstranitelný díl plotu"
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr "Editovat odstranitelný díl plotu"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr "Brána otevíratelná nárazníkem vozidla"
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr "Editovat bránu otevíratelnou nárazníkem vozidla"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr "Průchod v ohrazení s ostrou zatáčkou"
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr "Editovat průchod v ohrazení s ostrou zatáčkou"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr "Schůdky přes ohrazení"
@@ -14676,15 +14718,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr "Editovat schůdky přes ohrazení"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+#, fuzzy
+msgid "Turnstile"
+msgstr "Točna"
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "Editovat schůdky přes ohrazení"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr "Průchod se dvěma vraty"
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr "Upravit průchod se dvěma vraty"
@@ -14695,10 +14749,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr "Vodní plocha"
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr "Pramen"
@@ -14706,5 +14760,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr "Upravit pramen"
@@ -14712,5 +14766,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr "Odvodňovací kanál, meliorace"
@@ -14718,10 +14772,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr "Editovat odvodňovací kanál, meliorace"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr "Potok"
@@ -14729,10 +14783,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr "Upravit potok"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr "Plavební kanál"
@@ -14740,10 +14794,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr "Upravit plavební kanál"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr "Řeka"
@@ -14753,5 +14807,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr "Upravit řeku"
@@ -14759,15 +14813,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr "Upravit vodní plochu"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr "Země (souš)"
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr "Upravit plochu země"
@@ -14775,15 +14829,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr "Vodní nádrž"
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr "Upravit vodní nádrž"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr "Umělá vodní plocha"
@@ -14791,15 +14845,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr "Upravit umělou vodní plochu"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr "Zakrytá umělá vodní plocha"
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr "Upravit zakrytou umělou vodní plochu"
@@ -14807,5 +14861,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr "Břeh řeky"
@@ -14814,10 +14868,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr "Upravit břeh řeky"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr "Mokřina"
@@ -14828,14 +14882,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr "Upravit mokřinu"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr "bažina"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr "močál"
@@ -14849,35 +14903,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr "mokřina"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr "rákosiny"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr "slanisko"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr "přílivová oblast"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr "mangrove"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr "Bahno"
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr "Upravit bahno"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr "Pláž"
@@ -14885,20 +14939,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr "Upravit pláž"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr "Zátoka"
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr "Upravit zátoku"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr "Útes"
@@ -14906,10 +14960,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr "Upravit útes"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr "Linie pobřeží"
@@ -14917,5 +14971,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr "Upravit linii pobřeží"
@@ -14923,5 +14977,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr "Přívoz"
@@ -14929,5 +14983,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr "Upravit přívoz"
@@ -14936,5 +14990,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr "doky"
@@ -14942,10 +14996,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr "Upravit doky"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr "Dok"
@@ -14953,5 +15007,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr "Upravit dok"
@@ -14959,5 +15013,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr "Hráz přehrady"
@@ -14965,15 +15019,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr "Upravit přehradu"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr "Vodní objekty"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr "Plavební komora"
@@ -14982,5 +15036,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr "Jez"
@@ -14988,20 +15042,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr "Upravit jez"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr "Vodopád"
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr "Upravit vodopád"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr "Rožšířené místo pro otáčení lodí"
@@ -15010,15 +15064,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr "Přístav"
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr "Upravit přístav"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr "Molo"
@@ -15026,10 +15080,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr "Upravit molo"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr "Přístaviště přívozu"
@@ -15037,10 +15091,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr "Upravit přístaviště přivozu"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr "Skluz v loděnici"
@@ -15050,5 +15104,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr "Upravit skluz v loděnici"
@@ -15056,10 +15110,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr "Železnice"
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr "Železnice"
@@ -15067,5 +15121,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr "Upravit železnici"
@@ -15095,8 +15149,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr "Volitelné typy"
@@ -15110,35 +15164,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr "seřazovací kolej"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr "paralelní pomocná dráha"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr "vlečka"
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr "Úzkorozchodná železnice"
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr "Upravit úzkorozchodnou železnici"
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr "Monorail"
@@ -15146,45 +15200,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr "Upravit monorail"
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr "Historická trať"
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr "Upravit historickou trať"
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr "Krátká/lehká trať"
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr "Upravit krátká/lehká trať"
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr "Metro"
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr "Upravit metro"
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr "Tramvaj"
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr "Upravit tramvaj"
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr "Autobusová dráha"
@@ -15192,5 +15246,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr "Upravit autobusovou dráhu"
@@ -15199,14 +15253,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr "Nepoužívaná železnice"
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr "Upravit nepoužívanou železnici"
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr "Opuštěná železnice"
@@ -15215,5 +15269,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr "železniční přejezd"
@@ -15222,5 +15276,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr "Železniční přechod pro chodce"
@@ -15230,5 +15284,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr "Druh křížení"
@@ -15236,5 +15290,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr "Točna"
@@ -15243,10 +15297,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr "Lanovky"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr "Sedačková lanovka"
@@ -15254,10 +15308,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr "Upravit sedačkovou lanovku"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr "Lyžařský vlek"
@@ -15265,10 +15319,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr "Upravit lyžařský vlek"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr "Kyvadlová kabinková lanovka"
@@ -15276,10 +15330,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr "Upravit kyvadlovou kabinkovou lanovku"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr "Oběžná kabinková lanovka"
@@ -15287,5 +15341,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr "Upravit oběžnou kabinkovou lanovku"
@@ -15293,5 +15347,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr "Stanice"
@@ -15302,10 +15356,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr "Upravit stanici"
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr "Čerpací stanice"
@@ -15315,5 +15369,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr "Upravit čerpací stanici"
@@ -15329,5 +15383,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15337,5 +15391,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr "Upravit parkoviště"
@@ -15343,41 +15397,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr "Kapacita"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr "povrchové"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr "vícepodlažní"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr "podzemní"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr "park and ride"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr "Místa pro vozíčkáře"
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr "Poplatek"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr "Myčka"
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr "Upravit myčku aut"
@@ -15385,5 +15439,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr "Obchod"
@@ -15391,15 +15445,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr "Upravit obchod s auty"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr "Opravna"
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr "Upravit autoopravnu"
@@ -15407,5 +15461,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr "Půjčovna"
@@ -15414,10 +15468,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr "Upravit půjčovnu aut"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr "Sdílení"
@@ -15425,5 +15479,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr "̈́Upravit sdílení aut"
@@ -15431,5 +15485,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr "Upravit parkoviště pro kola."
@@ -15438,5 +15492,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr "Upravit půjčovnu kol"
@@ -15445,15 +15499,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr "Upravit prodejnu kol"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "Hromadná doprava"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -15461,5 +15515,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr "Železniční zastávka"
@@ -15467,5 +15521,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr "Upravit železniční zastávku"
@@ -15473,5 +15527,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr "Tramvajová zastávka"
@@ -15480,5 +15534,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr "Upravit tramvajovou zastávku"
@@ -15486,5 +15540,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr "Železniční nástupiště"
@@ -15493,5 +15547,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr "Upravit železniční nástupiště"
@@ -15503,5 +15557,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr "Číslo nástupiště"
@@ -15509,10 +15563,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr "Označit jako plochu"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr "Vchod do metra"
@@ -15521,10 +15575,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr "Upravit vchod do metra"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr "Invalidní vozík"
@@ -15533,5 +15587,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr "Autobusové nádraží"
@@ -15540,5 +15594,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr "Upravit autobusové nádraží"
@@ -15546,5 +15600,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr "Zastávka autobusu"
@@ -15554,5 +15608,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr "Upravit zastávku autobusu"
@@ -15563,6 +15617,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr "Přístřešek"
@@ -15570,10 +15624,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr "Nástupiště autobusu"
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr "Upravit nástupiště autobusu"
@@ -15581,5 +15635,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr "Stanoviště taxi"
@@ -15587,5 +15641,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr "Upravit stanoviště taxi"
@@ -15593,5 +15647,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr "Letiště"
@@ -15599,15 +15653,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr "Upravit letiště"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr "ICAO"
@@ -15616,5 +15670,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr "Ubytování"
@@ -15626,5 +15680,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -15633,15 +15687,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr "Upravit hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr "Počet hvězdiček"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr "Motel"
@@ -15649,20 +15703,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr "Upravit motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr "Penzion"
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr "Upravit penzion"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr "Horská chata"
@@ -15670,10 +15724,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr "Upravit horskou chatu"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr "Hostel"
@@ -15681,30 +15735,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr "Upravit hostel"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr "Horská bouda"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr "Upravit vysokohorskou boudu"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr "Autokemping (karavany)"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr "Upravit autokemping (karavany)"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr "Tábořiště"
@@ -15712,10 +15766,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr "Upravit tábořiště"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "Jídlo a pití"
@@ -15726,5 +15780,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurace"
@@ -15732,5 +15786,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr "Upravit restauraci"
@@ -15738,5 +15792,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr "Kuchyně"
@@ -15744,61 +15798,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr "italská"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr "čínská"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr "řecká"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr "německá"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr "indická"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr "místní"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr "turecká"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr "asijská"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr "thajská"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr "mexická"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr "japonská"
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr "Rychlé občersvení"
@@ -15806,9 +15860,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr "Upravit rychlé občerstvení"
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr "Kavárna"
@@ -15816,10 +15870,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr "Upravit kavárnu"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr "Hospoda"
@@ -15827,20 +15881,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr "Upravit hospodu"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr "Hospoda-zahrádka"
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr "Upravit hospoda-zahrádka"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr "Bar"
@@ -15848,10 +15902,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr "Upravit bar"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr "Noční klub"
@@ -15859,20 +15913,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr "Upravit noční klub"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "Turistika"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr "Atrakce"
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr "Upravit atrakci"
@@ -15881,11 +15935,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr "Otevírací doba"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "Muzeum"
@@ -15893,10 +15947,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr "Upravit muzeum"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "Zoo"
@@ -15905,10 +15959,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr "Upravit zoo"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr "Vyhlídka"
@@ -15916,25 +15970,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr "Upravit vyhlídku"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr "Vyhlídková věž"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr "Zábavní park"
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr "Upravit zábavní park"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr "Umělecké dílo"
@@ -15942,5 +15996,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr "Upravit umělecké dílo"
@@ -15948,5 +16002,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr "Turistické informační centrum"
@@ -15954,80 +16008,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr "Editovat turistické informační centrum"
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "Přehledová mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr "Typ mapy"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr "mapa"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr "plán města"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr "turistická mapa"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr "cyklistická mapa"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
 msgid "Closer Description"
 msgstr "Bližší popis"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1701
 msgid "Information Board"
 msgstr "Informační nástěnka"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Board Type"
 msgstr "Typ nástěnky"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "board"
 msgstr "obecná nástěnka"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "history"
 msgstr "informace o historii"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "nature"
 msgstr "informace o přírodě"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "wildlife"
 msgstr "informace o divokých zvířatech"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Guidepost (Hiking)"
 msgstr "Rozcestník (pěší)"
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr "Jiný informační bod"
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr "Upravit přístřešek"
@@ -16035,25 +16089,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr "Ohniště"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr "Místo na piknik"
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr "Upravit místo na piknik"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "Historická místa"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "Zámek/Hrad"
@@ -16062,20 +16116,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr "Upravit zámek/hrad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "Zřícenina"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr "Upravit zříceninu"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr "Archeologické naleziště"
@@ -16084,10 +16138,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr "Upravit archeologické naleziště"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr "Bojiště"
@@ -16095,5 +16149,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr "Upravit bojiště"
@@ -16101,15 +16155,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr "Upravit monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr "Památník"
@@ -16117,45 +16171,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr "Upravit památník"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr "Kříž"
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr "Upravit kříž"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr "Boží muka"
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr "Upravit boží muka"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "Volný čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr "Akvapark"
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr "Upravit akvapark"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "Hřiště"
@@ -16163,15 +16217,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr "Upravit hřiště"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "Rybaření"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr "Upravit rybaření"
@@ -16179,15 +16233,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr "Sportovní zařízení"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr "Upravit stadion"
@@ -16201,6 +16255,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "vyberte sport:"
@@ -16223,4 +16277,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -16281,5 +16343,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16289,5 +16359,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16433,5 +16503,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16537,5 +16607,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16576,29 +16646,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr "sport"
@@ -16608,227 +16679,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr "kombinovaný"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr "lukostřelba"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr "atletika"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr "australský fotbal"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr "basketbal"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr "Hry s koulemi (např. pétanque)"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr "bowls"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr "kanoistika"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr "Horolezení"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr "ohražené místo pro tréning kriketu"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr "kroket"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr "cyklistika"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr "závody psů"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr "krasojízda"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr "fotbal"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr "gymnastika"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr "dostihy"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr "motoristické sporty"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr "pelota (míčová hra)"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr "pálkové (raketové) sporty"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr "ragby"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr "střelba"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr "bruslení"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr "lyžování"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "fotbal"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr "plavání"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "stolní tenis"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr "Sportovní centrum"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr "Upravit sportovní centrum"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr "Hřiště"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr "Upravit hřiště"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr "Závodní trať"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr "Upravit závodní trať"
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr "Golfové hřiště"
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr "Upravit golfové hřiště"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr "Upravit minigolf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr "Kombinováné"
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr "Upravit kombinované"
@@ -16867,191 +16938,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr "hřiště"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr "sportovní centrum"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr "Upravit bowling"
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr "Atletika"
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr "Upravit atletiku"
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr "Lukostřelba"
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr "Upravit lukostřelbu"
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr "Horolezení"
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr "Upravit horolezení"
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr "Kanoistika"
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr "Upravit kanoistiku"
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr "Cyklistika"
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr "Upravit cyklistiku"
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr "Závody psů"
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr "Upravit závody psů"
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr "Krasojízda"
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr "Upravit krasojízdu"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr "Dostihy"
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr "Upravit dostihy"
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr "Gymnastika"
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr "Upravit gymnastiku"
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr "Motorové sporty"
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr "Upravit motorové sporty"
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr "Bruslení"
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr "Upravit bruslení"
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr "Upravit Skateboard"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr "Plavání"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr "Upravit plavání"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr "Lyžování"
@@ -17059,56 +17130,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr "Upravit lyžování"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr "Typ sjezdovky"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr "Sjezdovka"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr "Běžecká trať"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr "snow park"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr "Obtížnost"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr "pro začátečníky (zelená)"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr "jednoduchá (modrá)"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr "pro středně pokročilé (červená)"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr "pro zkušené (černá)"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr "pro experty (oranžová)"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr "volný terén - freeride (žlutá)"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr "Střelba"
@@ -17116,178 +17187,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr "Upravit střelbu"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr "Sport (míčové hry)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr "Fotbal"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr "Upravit fotbal"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr "Fotbal"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr "Upravit fotbal"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr "Australský fotbal"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr "Upravit australský fotbal"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr "Upravit baseball"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr "Basketbal"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr "Upravit basketbal"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr "Upravit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr "golfové hřiště"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr "Hry s koulemi (např. pétanque)"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr "Upravit hry s koulemi (např. pétanque)"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr "Upravit Bowls"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr "Upravit kriket"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr "Ohražené místo pro tréning kriketu"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr "Upravit ohražené místo pro tréning kriketu"
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr "Kroket"
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr "Upravit kroket"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr "Upravit hokej"
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr "Pelota (míčová hra)"
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr "Upravit pelotu (míčová hra)"
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr "Pálkové (raketové) sporty"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr "Upravit pálkové (raketové) sporty"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr "Ragby"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr "Upravit ragby"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr "Stolní tenis (ping-pong)"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr "Upravit stolní tenis (ping-pong)"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr "Upravit tenis"
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "Budovy"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr "Budova"
@@ -17295,5 +17366,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "Veřejná budova"
@@ -17301,10 +17372,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr "Upravit veřejnou budovu"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "Radnice"
@@ -17312,10 +17383,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "Upravit radnici"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "Ambasáda"
@@ -17323,10 +17394,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "Upravit ambasádu"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "Soud"
@@ -17335,10 +17406,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "Upravit soud"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "Vězení"
@@ -17347,10 +17418,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "Upravit vězení"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "Policie"
@@ -17360,10 +17431,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "Upravit policii"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "Hasičská stanice"
@@ -17372,10 +17443,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "Upravit hasičskou stanici"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "Pošta"
@@ -17383,5 +17454,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr "Upravit poštu"
@@ -17389,15 +17460,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr "Mateřská škola"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr "Upravit mateřskou školu"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "Škola"
@@ -17405,10 +17476,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "Upravit školu"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr "Vysoká škola"
@@ -17416,10 +17487,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr "Upravit vysokou školu"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr "Střední škola"
@@ -17427,5 +17498,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr "Upravit střední školu"
@@ -17433,5 +17504,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "Kino"
@@ -17440,10 +17511,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "Upravit kino"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "Knihovna"
@@ -17452,10 +17523,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "Upravit knihovnu"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr "Komunitní umělecké centrum"
@@ -17463,10 +17534,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr "Upravit komunitní umělecké centrum"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "Divadlo"
@@ -17475,10 +17546,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "Upravit divadlo"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr "Chrám(kostel, synagoga, mešita)"
@@ -17488,5 +17559,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr "Upravit chrám"
@@ -17495,6 +17566,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr "Náboženství"
@@ -17503,66 +17574,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr "bahá'í"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr "budhistické"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr "křesťanské"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr "hindské"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr "džinistické"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr "židovské"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr "muslimské"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr "spiritualistické"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr "taoistické"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr "Unitářské"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr "zoroastristické"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr "Vyznání"
@@ -17571,81 +17642,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr "anglikánské"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr "baptistické"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr "katolické"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr "evangelické"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr "svědkové Jehovovi"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr "luteránské"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr "metodistické"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr "mormonské"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr "pravoslavné"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr "pentekostalistické"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr "presbyteriánské"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr "protestantské"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr "kvakerské"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr "ší'itské"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr "sunnitské"
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr "Adresy"
@@ -17654,5 +17725,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr "Upravit informace o adrese"
@@ -17660,5 +17731,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr "Číslo domu"
@@ -17666,20 +17737,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr "Jméno domu"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr "Jméno města"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "Poštovní směrovací číslo"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr "Kód země"
@@ -17687,5 +17758,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr "Interpolace adres"
@@ -17694,5 +17765,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr "Upravit interpolaci adres"
@@ -17700,71 +17771,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr "Schéma číslování"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr "liché"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr "sudé"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr "všechny"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr "abecední"
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr "Umělé konstrukce"
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr "Továrna"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr "Upravit továrnu"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "Věž"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "Upravit věž"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "Vodojem"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "Upravit vodojem"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr "Plynojem"
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr "Upravit plynojem"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "Maják"
@@ -17772,10 +17843,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "Upravit maják"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "Větrný mlýn"
@@ -17783,10 +17854,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "Upravit větrný mlýn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "Potrubí"
@@ -17794,10 +17865,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "Upravit potrubí"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr "Čistička odpadních vod"
@@ -17807,10 +17878,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr "Upravit čističku odpadních vod"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr "Jeřáb"
@@ -17818,10 +17889,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr "Upravit jeřáb"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr "Vodní bój"
@@ -17829,10 +17900,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr "Editovat vodní bój"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr "Triangulační bod"
@@ -17840,10 +17911,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr "Upravit triangulační bod"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr "Sledovací kamera"
@@ -17851,5 +17922,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr "Upravit sledovací kameru"
@@ -17857,5 +17928,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr "Elektrárna"
@@ -17865,39 +17936,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr "Upravit elektrárnu"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr "větrná"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr "vodní"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr "fosilní paliva"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr "jaderná"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr "uhelná"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr "sluneční"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr "plynová"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr "Rozvodna"
@@ -17906,10 +17977,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr "Upravit rozvodnu"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr "Trafostanice"
@@ -17918,5 +17989,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr "Upravit trafostanici"
@@ -17924,10 +17995,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr "Číslo vedení"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr "Stožár elektrického vedení"
@@ -17938,5 +18009,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr "Upravit stožár elektrického vedení"
@@ -17944,5 +18015,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr "Dráty elektrického vedení"
@@ -17951,25 +18022,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr "Upravit dráty elektrického vedení"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr "Napětí"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr "Počet drátů tvořících vodič"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr "Občanská vybavenost"
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "Záchody"
@@ -17977,20 +18048,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr "Číslo záchodu"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr "Poznámka"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr "Poštovní schránka"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "Telefon"
@@ -17999,5 +18070,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr "Upravit telefon"
@@ -18005,5 +18076,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "Mince"
@@ -18011,5 +18082,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr "Bankovky"
@@ -18017,5 +18088,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronické peněženky nebo kreditní karty."
@@ -18023,5 +18094,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr "Debetní karty"
@@ -18029,15 +18100,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "Kreditní karty"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "Telefonní karty"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr "Recyklační stanoviště"
@@ -18046,5 +18117,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr "Upravit recyklační stanoviště"
@@ -18052,35 +18123,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr "Baterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr "Plechovky"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr "Oblečení"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr "Sklo"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr "Papír"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr "Kovový šrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr "Lavička"
@@ -18089,20 +18160,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr "Posed"
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr "Upravit posed"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr "Úkryt"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr "Uzamknutelný"
@@ -18110,22 +18181,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr "Výška"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr "nízká"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr "střední"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr "plná"
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr "Fontána"
@@ -18134,10 +18205,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr "Upravit fontánu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "Pitná voda"
@@ -18146,10 +18217,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "Upravit pitnou vodu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr "Babybox"
@@ -18157,25 +18228,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr "Upravit babybox"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "Obchody"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr "Upravit supermarket"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr "Samoobsluha, smíšenka, večerka"
@@ -18183,10 +18254,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr "Upravit večerku"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr "Kiosek"
@@ -18194,10 +18265,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr "Upravit kiosek"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "Prodejní automat"
@@ -18205,5 +18276,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "Upravit prodejní automat"
@@ -18211,88 +18282,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "Prodávané produkty"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr "lístky na městskou hromadnou dopravu"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr "plány městské hromadné dopravy"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr "parkovací lístky"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr "jídlo"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "pití"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr "sladkosti"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr "cigarety"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr "fotografie"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr "krmivo pro zvířata"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "noviny"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "hračky"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr "známky"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "SIM-karty"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr "telefonní karty"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr "poukazy"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr "kondomy"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr "tampóny"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr "sáčky na výkaly"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr "Zůstatkové nebo věrnostní karty"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "Řeznictví"
@@ -18300,10 +18371,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "Upravit řeznictví"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "Pekařství"
@@ -18311,10 +18382,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "Upravit pekařství"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr "Květinářství"
@@ -18322,20 +18393,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr "Upravit květinářství"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr "Obchod se zdravou výživou"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr "Upravit obchod se zdravou výživou"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -18343,60 +18414,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr "Upravit obchod s alkoholem"
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr "Nápoje"
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr "Upravit obchod s nápoji"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr "Počítače"
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr "Upravit obchod s počítači"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr "Elektronika"
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr "Upravit obchod s elektronikou"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr "Upravit obchod s hifi"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr "Nábytek"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr "Upravit obchod s nábytkem"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr "Zahradnické centrum"
@@ -18404,10 +18475,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr "Upravit zahradnické centrum"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr "Železářství"
@@ -18415,10 +18486,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr "Upravit železářství"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr "Zboží pro kutily"
@@ -18426,60 +18497,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr "Upravit obchod se zbožím pro kutily"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr "Papírnictví"
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr "Upravit papírnictví"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr "Kadeřnictví"
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr "Upravit Kadeřnictví"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr "Obuv"
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr "Upravit obchod s obuví"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr "Hračky"
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr "Upravit obchod s hračkami"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr "Videopůjčovna/prodejna"
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr "Upravit videopůjčovnu/prodejnu"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "Čistírna"
@@ -18487,10 +18558,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "Upravit čistírnu"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "Prádelna"
@@ -18498,10 +18569,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "Upravit prádelnu"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr "Vybavení do přírody"
@@ -18509,35 +18580,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr "Obchod s vybavením do přírody"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr "Sportovní potřeby"
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr "Upravit obchod se sportovními pořebami"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr "Oční optik"
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr "Upravit oční optiku"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "Finance"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "Banka"
@@ -18545,5 +18616,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "Upravit banku"
@@ -18551,10 +18622,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr "Směnárna"
@@ -18562,5 +18633,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr "Upravit směnárnu"
@@ -18568,15 +18639,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "Upravit bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "Zdraví"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr "Středisko"
@@ -18584,20 +18655,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr "Upravit středisko"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr "Zubař"
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr "Upravit zubařskou ordinaci"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "Lékárna"
@@ -18605,5 +18676,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "Upravit lékárnu"
@@ -18611,10 +18682,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr "Vydává léky na předpis"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "Nemocnice"
@@ -18622,10 +18693,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "Upravit nemocnici"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr "Místo pro kontaktování záchranářů"
@@ -18634,5 +18705,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr "Upravit místo pro kontaktování záchranářů"
@@ -18641,20 +18712,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr "Číslo místa"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr "Jméno místa"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr "Telefonní číslo"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Použijte mezinárodní zápis, např. +420123456789)"
@@ -18662,5 +18733,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr "Veterinář"
@@ -18669,56 +18740,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr "Upravit veterinární ordinaci"
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr "Upravit kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr "Stát"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr "Upravit stát"
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr "Země"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr "Upravit zemi"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr "Kraj"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr "Upravit kraj"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr "Okres"
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr "Upravit okres"
@@ -18726,15 +18796,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr "Velkoměsto"
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr "Upravit velkoměsto"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr "Město"
@@ -18742,10 +18812,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr "Upravit město"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr "Městský obvod, nebo městská část"
@@ -18753,25 +18823,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr "Upravit městský obvod, nebo městská část"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "Obec"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "Upravit obci"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr "Samota"
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr "Upravit samotu"
@@ -18779,5 +18849,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr "Místní název"
@@ -18785,10 +18855,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr "Editovat místní název"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "Ostrov"
@@ -18796,5 +18866,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "Upravit ostrov"
@@ -18802,5 +18872,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr "Vstup do jeskyně"
@@ -18808,10 +18878,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr "Upravit vstup do jeskyně"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "Vrchol"
@@ -18819,10 +18889,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "Upravit vrchol"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr "Ledovec"
@@ -18830,10 +18900,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr "Upravit ledovec"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr "Sopka"
@@ -18841,70 +18911,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr "Upravit sopku"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr "Hranice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr "Národní"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr "Upravit národní hranici"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr "Administrativní"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr "Upravit administrativní hranici"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr "Volební obvod"
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr "Upravit volební obvod"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr "Národní park"
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr "Upravit hranice národního parku"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr "Využití krajiny"
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "Strom"
@@ -18913,15 +18983,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "Upravit strom"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr "Botanické jméno"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr "Prales"
@@ -18930,5 +19000,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr "Editovat Prales"
@@ -18936,17 +19006,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr "jehličnatý"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr "listnatý"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr "smíšený"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "Les"
@@ -18955,14 +19025,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr "Upravit lesní plochu"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr "Přírodní rezervace"
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr "Upravit přírodní rezervaci"
@@ -18970,25 +19040,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr "Suťoviště"
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr "Upravit suťoviště"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr "Podrost"
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr "Upravit podrost"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr "Travnatá pahorkatina"
@@ -18996,10 +19066,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr "Upravit travnatou pahorkatinu"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr "Vřesoviště"
@@ -19007,5 +19077,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr "Upravit vřesoviště"
@@ -19013,5 +19083,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr "Farma"
@@ -19020,45 +19090,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr "Upravit farmu"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr "Zemědělská půda"
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr "Upravit zemědělskou půdu"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr "Louka"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr "Upravit louku"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr "Vinice"
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr "Upravit vinici"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr "Zahrádkářská kolonie"
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr "Upravit zahrádkářskou kolonii"
@@ -19066,25 +19136,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr "Zahrada"
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr "Upravit zahradu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr "Tráva"
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr "Upravit travnatou plochu"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr "Zelená plocha"
@@ -19092,10 +19162,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr "Upravit zelenou plochu"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr "veřejná zeleň (mimo parky)"
@@ -19103,20 +19173,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr "Upravit veřejnou zeleň"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr "Upravit park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr "Rekreační plocha"
@@ -19124,5 +19194,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr "Upravit rekreační plochu"
@@ -19130,15 +19200,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr "Obytná plocha"
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr "Upravit obytnou plochu"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr "Malý hřbitov"
@@ -19146,9 +19216,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr "Upravit malý hřbitov"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr "Hřbitov"
@@ -19156,39 +19226,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr "Upravit hřbitov"
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr "Obchody"
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr "Upravit plochu s obchody"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr "Kanceláře"
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr "Upravit kancelářskou plochu"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr "Průmysl"
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr "Upravit průmyslovou plochu"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr "Železniční plocha"
@@ -19196,15 +19266,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr "Upravit železniční plochu"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr "Vojenský prostor"
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr "Upravit vojenský prostor"
@@ -19212,55 +19282,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr "Probíhající výstavba"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr "Upravit výstavbu"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr "Stará zátěž, městské ruiny (Brownfield)"
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr "Upravit starou zátěž (Brownfield)"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr "Zastavitelné území (Greenfield)"
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr "Upravit zastavitelné území (Greenfield)"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr "skládka odpadu"
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr "Upravit skládku odpadu"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr "Lom"
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr "Upravit lom"
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -19270,5 +19340,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr "Upravit multipolygon"
@@ -19277,10 +19347,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr "vnější část"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr "vnitřní část"
@@ -19288,5 +19358,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr "Zákaz odbočení"
@@ -19295,5 +19365,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr "Upravit zákaz odbočení"
@@ -19301,34 +19371,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr "Omezení"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr "zákaz odbočení vlevo"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr "zákaz odbočení vpravo"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr "zákaz jízdy rovně"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr "zákaz otáčení"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr "pouze odbočení vpravo"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr "pouze odbočení vlevo"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr "pouze jízda rovně"
@@ -19337,15 +19407,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr "z cesty"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr "přes uzel nebo cestu"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr "na cestu"
@@ -19353,5 +19423,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr "Trasa"
@@ -19360,5 +19430,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr "Upravit trasu"
@@ -19366,5 +19436,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr "Typ trasy"
@@ -19436,24 +19506,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr "bicykl"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr "silnice"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr "trajekt"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr "lyžařská"
@@ -19506,20 +19576,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr "pěší"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr "turistická"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr "tramvajová"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr "objízdná"
@@ -19533,10 +19603,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr "Popis symbolu"
@@ -19544,26 +19614,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr "Síť"
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "Typ trasy"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr "navrhovaná"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr "alternativní"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr "dočasná"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr "spojení"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr "Barva (hex)"
@@ -19572,30 +19648,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr "segment trasy"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr "dopředný segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr "zpětný segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr "zastávka"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr "dopředná zastávka"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr "zpětná zastávka"
@@ -19631,6 +19707,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19646,5 +19723,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19663,5 +19748,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr "standardní"
@@ -19755,7 +19840,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr "most"
@@ -20020,15 +20105,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr "zastaralý"
@@ -20070,5 +20155,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr "koňská"
@@ -20206,4 +20291,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20215,5 +20306,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20221,5 +20312,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20256,5 +20347,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20278,11 +20369,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr "překážka"
@@ -20306,5 +20397,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20345,5 +20436,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20381,6 +20472,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr "ulice"
@@ -20436,7 +20527,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr "dálnice"
@@ -20489,11 +20580,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr "železnice"
@@ -20514,5 +20613,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr ""
@@ -20526,5 +20625,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr "brod"
@@ -20545,5 +20644,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr ""
@@ -20557,6 +20656,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr ""
@@ -20571,5 +20670,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr "říční břeh"
@@ -20583,5 +20682,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr "potok"
@@ -20595,5 +20694,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr ""
@@ -20621,5 +20720,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr "akvadukt"
@@ -20762,5 +20861,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20787,13 +20886,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr ""
@@ -20855,7 +20954,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr ""
@@ -20878,10 +20977,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr ""
@@ -20917,7 +21016,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr ""
@@ -20962,6 +21061,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr ""
@@ -20975,5 +21074,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr "terminál"
@@ -20995,5 +21094,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr ""
@@ -21007,5 +21106,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr ""
@@ -21013,4 +21112,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21053,7 +21159,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr "lanovka"
@@ -21070,5 +21176,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr "lehká sjezdovka"
@@ -21083,5 +21189,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr "střední sjezdovka"
@@ -21096,5 +21202,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr "těžká sjezdovka"
@@ -21109,5 +21215,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr ""
@@ -21122,5 +21228,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr ""
@@ -21135,5 +21241,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr "sjezdovka pro začátečníky"
@@ -21156,4 +21262,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -21164,4 +21277,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -21238,10 +21359,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr ""
@@ -21255,5 +21377,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr "molo"
@@ -21267,5 +21389,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr "potrubí"
@@ -21393,12 +21515,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr ""
@@ -21412,5 +21534,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr "přísav"
@@ -21482,8 +21604,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr "občanská vybavenost"
@@ -21585,10 +21707,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr ""
@@ -21608,4 +21730,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21627,4 +21756,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21948,4 +22084,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -21972,24 +22116,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr ""
@@ -22021,6 +22173,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr "menší vodní plochy"
@@ -22081,8 +22233,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr "zdravotnictví"
@@ -22435,26 +22587,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr "obchod"
@@ -22509,5 +22661,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22526,8 +22678,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr "hotel"
@@ -22677,9 +22829,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr "turistika"
@@ -22751,8 +22903,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr "historické"
@@ -22823,8 +22975,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr "zeleň"
@@ -22838,5 +22990,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr "lom"
@@ -22850,5 +23002,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr "skládka"
@@ -22870,5 +23022,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr "nádrže"
@@ -22882,5 +23034,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr "les"
@@ -22894,5 +23046,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr "zemědělství"
@@ -22915,5 +23067,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr "obchody"
@@ -22927,5 +23079,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr "průmysl"
@@ -22939,5 +23091,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr "stará zátěž, městské ruiny (Brownfield)"
@@ -22951,5 +23103,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr "Zastavitelné území (Greenfield)"
@@ -22963,5 +23115,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr "železniční plochy"
@@ -23018,7 +23170,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr "vojenský"
@@ -23032,5 +23184,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr "hřbitov"
@@ -23043,5 +23195,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr "vrchol"
@@ -23056,5 +23208,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr "ledovec"
@@ -23068,5 +23220,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr "sopka"
@@ -23121,8 +23273,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr "přírodní"
@@ -23136,5 +23288,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr "křoví"
@@ -23148,5 +23300,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr "vřesoviště"
@@ -23160,5 +23312,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr "Prales"
@@ -23172,5 +23324,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr "bahno"
@@ -23184,5 +23336,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr "pláž"
@@ -23260,8 +23412,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr "cesta"
@@ -23309,7 +23461,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr "hranice"
@@ -23451,10 +23603,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr "místo"
@@ -23502,6 +23654,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr "adresa"
@@ -23798,46 +23950,24 @@
 msgstr ""
 
-#~ msgid "Unknown file extension for file ''{0}''"
-#~ msgstr "Neznámá přípona souboru ''{0}''"
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Data Layer"
+#~ msgstr "Vrstva dat"
+
+#~ msgid "unnamed"
+#~ msgstr "nepojmenováno"
 
 #~ msgid "Unknown file extension."
 #~ msgstr "Neznámá přípona souboru."
 
-#~ msgid "An error occurred while saving. Error is: {0}"
-#~ msgstr "Došlo k chybě při ukládání. Chyba: {0}"
-
-#~ msgid ""
-#~ "<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>"
+#~ msgid "Change"
+#~ msgstr "Změnit"
+
+#~ msgid "Rotate"
+#~ msgstr "Otočit"
 
 #~ msgid "Move"
 #~ msgstr "Přesunout"
-
-#~ msgid "Invalid projection"
-#~ msgstr "Neplatná projekce"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Nejprve změňte projekci na {0}."
-
-#~ msgid "end"
-#~ msgstr "konec"
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "Data Layer"
-#~ msgstr "Vrstva dat"
-
-#~ msgid "unnamed"
-#~ msgstr "nepojmenováno"
-
-#~ msgid "Change"
-#~ msgstr "Změnit"
-
-#~ msgid "Rotate"
-#~ msgstr "Otočit"
 
 #~ msgid "false"
@@ -24115,4 +24245,13 @@
 #~ msgstr ""
 #~ "Tato akce bude potřebovat {0} jednotlivých stažení dat. Chcete pokračovat?"
+
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Nejprve změňte projekci na {0}."
+
+#~ msgid "Invalid projection"
+#~ msgstr "Neplatná projekce"
+
+#~ msgid "end"
+#~ msgstr "konec"
 
 #~ msgid "Edit Drawbridge"
@@ -24226,2 +24365,15 @@
 #~ msgid "Apply partial resolutions"
 #~ msgstr "Aplikovat částečná řešení"
+
+#~ msgid ""
+#~ "<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>"
+
+#~ msgid "An error occurred while saving. Error is: {0}"
+#~ msgstr "Došlo k chybě při ukládání. Chyba: {0}"
+
+#~ msgid "Unknown file extension for file ''{0}''"
+#~ msgstr "Neznámá přípona souboru ''{0}''"
Index: /applications/editors/josm/i18n/po/da.po
===================================================================
--- /applications/editors/josm/i18n/po/da.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/da.po	(revision 17069)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
-"PO-Revision-Date: 2009-08-04 11:09+0000\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
+"PO-Revision-Date: 2009-08-10 13:36+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-10 11:58+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -56,6 +56,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -100,6 +100,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "Fejl"
@@ -110,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "Ugemte ændringer"
@@ -128,10 +128,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -148,15 +148,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -186,6 +186,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -215,5 +215,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -369,5 +369,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
 msgstr ""
@@ -451,9 +451,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -486,7 +486,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -569,37 +569,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "valgt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "hent"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zoom til {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zoom synsfeltet til {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -609,30 +609,30 @@
 msgstr "Vis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "Intet valgt at  zoome ind på."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "Ingen konflikter at zoome ind på."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "Sammensæt vej"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "Sammensæt adskillige veje til én"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "Vælg mindst to veje at sammensætte."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr "Sammensæt veje med forskellige tilhørsforhold?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -642,13 +642,13 @@
 "sammensætte dem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "Sammensæt alligevel"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "Skift retninger?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -658,10 +658,10 @@
 "nogle af dem om?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "Vend om og sammensæt"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -669,20 +669,20 @@
 msgstr "Indtast værdier for alle konflikter."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Løs konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Sammensæt {0} veje"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "Alle vejene var tomme"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -729,6 +729,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -750,6 +750,6 @@
 msgstr "Slet valgte objekter."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -759,5 +759,5 @@
 msgstr "Overskriv"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -889,7 +889,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "Eksporter dataet til GPS-fil."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -905,5 +904,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -921,5 +920,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -993,22 +992,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "Foren punkter"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "Foren punkter til den ældste."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "Vælg mindst to punkter, der skal forenes."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr "Foren punkter med forskellige medlemsskaber?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1018,9 +1017,9 @@
 "sammenflette dem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "Sammenflet alligevel"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -1028,5 +1027,5 @@
 "er i brug."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1280,7 +1279,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "Intet dokument er åbent, så der er intet at gemme."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1871,5 +1869,5 @@
 msgstr "Fejl ved download"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1881,5 +1879,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr "Slettede eller flyttede primitiver"
@@ -1918,11 +1916,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2060,5 +2058,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2134,5 +2132,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Søg efter objekter."
@@ -2257,5 +2255,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Søg"
@@ -2457,5 +2455,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2498,5 +2496,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr "Slet fra relation"
@@ -2538,9 +2536,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "Foren {0} punkter"
-msgstr[1] "Foren {0} punkter"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2576,9 +2574,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "{0} punkt"
-msgstr[1] "{0} punkter"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2743,7 +2741,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "rettesæt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2753,5 +2751,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2798,5 +2796,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2829,5 +2827,5 @@
 msgstr "parameteren \"{0}\" er ikke en acceptabel klasse, modtog \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2841,5 +2839,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "jernbane"
@@ -2854,5 +2852,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3131,5 +3129,5 @@
 msgstr "Vis ikke igen"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3140,5 +3138,5 @@
 "Tjek server-URL'en i dine indstillinger samt din internetforbindelse."
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3148,10 +3146,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3159,25 +3157,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "ukendt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3187,9 +3185,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3198,9 +3196,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "Uventet handling"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3210,9 +3220,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "Ukendt vært"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3222,5 +3232,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr "Primitiven er allerede slettet"
@@ -3311,10 +3321,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "Brugernavn"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "Kodeord"
@@ -3516,15 +3526,15 @@
 msgstr "(intet objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "lag er ikke i listen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3579,5 +3589,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr ""
@@ -3586,5 +3596,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr ""
@@ -3593,20 +3603,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3616,6 +3626,6 @@
 msgstr "Tags"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3623,6 +3633,6 @@
 msgstr "Punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3630,40 +3640,40 @@
 msgstr "Medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "Tags ({0} konflikter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr "Punkter (afklaret)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "Punkter (med konflikter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "Medlemmer (afklaret)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3671,74 +3681,74 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "Medlemmer (med konflikter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "Egenskaber (med konflikter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr "Sammenlign "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr "Min version"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr "Sammenflettet version"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3746,30 +3756,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr "Deres version"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr "> top"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr "> bund"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3777,5 +3787,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3783,13 +3793,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3797,5 +3807,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3803,21 +3813,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr "Op"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr "Flyt de valgte elementer ét trin op"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr "Ned"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr "Flyt de valgte elementer ét trin ned"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3826,27 +3836,27 @@
 msgstr "Fjern"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3854,5 +3864,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3861,5 +3871,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3868,5 +3878,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3875,5 +3885,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -3882,21 +3892,21 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -3906,5 +3916,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -3914,5 +3924,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -3920,19 +3930,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr "Punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr "uventet kolonne-indeks. Modtog {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -3941,19 +3951,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr "Ja, gendan også dem"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr "Nej, fortryd handlingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -3964,9 +3974,9 @@
 "slettet på serveren.<br><br>Ønsker du også at gendanne disse punkter?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr "Gendan yderligere punkter?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -3976,13 +3986,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr "Gendan afhængige primitiver?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -3990,90 +4000,90 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr "Koordinater:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr "ingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "slettet"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr "ikke slettet"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr "Behold mine koordinater"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr "Behold deres koordinater"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4083,17 +4093,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4102,14 +4112,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4117,21 +4127,21 @@
 msgstr "Rolle"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr "Primitiv"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4139,14 +4149,14 @@
 msgstr "<udefineret>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4154,7 +4164,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4166,7 +4176,7 @@
 msgstr "Nøgle"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4179,45 +4189,45 @@
 msgstr "Værdi"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr ""
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr "Parameteren 'col' skal være 0 eller 1. Modtog {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr "Min version (lokalt datasæt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr "Deres version (serverens datasæt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ">"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4237,8 +4247,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4277,5 +4287,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4377,83 +4387,83 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "Lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "Åbn en liste af alle hentede lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "Slet det valgte lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr "Slet lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "Vis/skjul"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "Skift synligheden for det valgte lag."
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "Flyt det valgte lag en række op."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "Flyt det valgte lag en række ned."
@@ -4463,6 +4473,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4471,22 +4481,22 @@
 msgstr[1] "Dette vil ændre på op til {0} objekter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "En tom værdi vil slette nøglen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<forskellige>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "Ret værdier?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4494,5 +4504,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4501,40 +4511,40 @@
 msgstr[1] "Ret egenskaber for op til {0} objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "Vælg venligst en nøgle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "Vælg venligst en værdi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 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/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "Egenskaber/medlemsskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "Egenskaber for valgte objekter."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "Medlem af"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "Tilføj egenskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4551,39 +4561,39 @@
 msgstr "Tilføj"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 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/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "Rediger egenskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 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/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaber: {0} / Medlemskaber: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "Egenskaber / Medlemskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "Skift relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Slet virkelig det valgte fra relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "Fjern den valgte nøgle i alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "Fjern egenskaber"
@@ -4595,5 +4605,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "Relationer"
@@ -4625,31 +4635,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "Aktuelt valg"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "Åbn et vindue med en liste til udvælgelse."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "Zoom til valgt(e) element(er)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "Genopfrisk listen til udvælgelse."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "Zoom til det valgte"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Valgt: Rel.:{0} / Veje:{1} / Punkter:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4657,5 +4667,5 @@
 msgstr "Markering"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4664,5 +4674,5 @@
 msgstr[1] "{0} veje"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4671,5 +4681,5 @@
 msgstr[1] "{0} relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -4879,7 +4889,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "Slet de nvalgte relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -4962,5 +4971,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5203,5 +5212,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "Steder"
@@ -5248,21 +5257,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "type"
@@ -6062,72 +6071,512 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "Navn"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr "Billeder for {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr "Indlæs GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Intet tidspunkt for punkt {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Kan ikke læse tidspunkt \"{0}\" for punkt {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr "Ingen billeder med læsbare tidsstempler fundet"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "Indlæser {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr "Geotaggede billeder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS-start: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS-slut: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr "nuværende forskel: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr "tidszone-forskel: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "billede"
+msgstr[1] "billeder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} inden for sporet."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "Synkronisér ur"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG-billeder (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Datoen i filen \"{0}\" kunne ikke forstås."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Der er intet EXIF-tidspunkt i filen \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "Billede"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Indtast den viste dato (mm/dd/åååå TT:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr "GPS-enhedens tidszone (forskel fra foto)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr "Synkronisér tidspunkt med GPS-enhed"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr "Den indtastede tid kunne ikke forstås."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr "gps-punkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "Tilpas linjetegning"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr "Brug globale indstillinger."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr "Tegn linjer mellem punkter for dette lag."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr "Tegn ikke linjer mellem punkter for dette lag."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr "Vælg linjetegnings-indstillinger"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "Tilpas farve"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Standard"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Vælg en farve"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr "Markører fra navngivne punkter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Navngivne punkter fra {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "Importér lyd"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave-lydfiler (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Lyd-markører fra {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "Importér billeder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} spor, "
+msgstr[1] "{0} spor, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} rute, "
+msgstr[1] "{0} ruter, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} punkt"
+msgstr[1] "{0} punkter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr "Navn: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr "Beskrivelse: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr "Tidshorisont: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr "Længde: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "Konvertér til datalag"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+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 af ubehandlet GPS-data som kortdata betragtes som skadeligt "
+"<br>Hvis du vil uploade traces, så kig her:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Konverteret fra: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr "Hent fra OSM langs dette spor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr "Hent alt inden for:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr "{0} meter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km²"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>This handling kræver {0} individuelle<br>download-anmodninger. Ønsker "
+"du<br>at fortsætte?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr ""
+"Ingen GPX-spor er tilgængelige i laget, som der kan associeres lyd med."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Datalag {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr "uden for det hentede område"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr "version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} består af:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} slettet.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr "API-version: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr "Konvertér til GPX-lag"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6136,7 +6585,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6146,445 +6595,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "Navn"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr "Billeder for {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr "Indlæs GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Intet tidspunkt for punkt {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Kan ikke læse tidspunkt \"{0}\" for punkt {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr "Ingen billeder med læsbare tidsstempler fundet"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Indlæser {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr "Geotaggede billeder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS-start: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS-slut: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr "nuværende forskel: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr "tidszone-forskel: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "billede"
-msgstr[1] "billeder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} inden for sporet."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "Synkronisér ur"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG-billeder (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Datoen i filen \"{0}\" kunne ikke forstås."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Der er intet EXIF-tidspunkt i filen \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "Billede"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Indtast den viste dato (mm/dd/åååå TT:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr "GPS-enhedens tidszone (forskel fra foto)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr "Synkronisér tidspunkt med GPS-enhed"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr "Den indtastede tid kunne ikke forstås."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr "gps-punkt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "Tilpas linjetegning"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "Brug globale indstillinger."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr "Tegn linjer mellem punkter for dette lag."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr "Tegn ikke linjer mellem punkter for dette lag."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr "Vælg linjetegnings-indstillinger"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "Tilpas farve"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Standard"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Vælg en farve"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr "Markører fra navngivne punkter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Navngivne punkter fra {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "Importér lyd"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave-lydfiler (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Lyd-markører fra {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "Importér billeder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} spor, "
-msgstr[1] "{0} spor, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} rute, "
-msgstr[1] "{0} ruter, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} punkt"
-msgstr[1] "{0} punkter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr "Navn: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr "Beskrivelse: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr "Tidshorisont: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr "Længde: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "Konvertér til datalag"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-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 af ubehandlet GPS-data som kortdata betragtes som skadeligt "
-"<br>Hvis du vil uploade traces, så kig her:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Konverteret fra: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr "Hent fra OSM langs dette spor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr "Hent alt inden for:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr "{0} meter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km²"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>This handling kræver {0} individuelle<br>download-anmodninger. Ønsker "
-"du<br>at fortsætte?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr ""
-"Ingen GPX-spor er tilgængelige i laget, som der kan associeres lyd med."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Datalag {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr "uden for det hentede område"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr "version {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} består af:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} slettet.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr "API-version: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr "Konvertér til GPX-lag"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -6958,5 +6967,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "Bil"
@@ -6973,16 +6982,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "Cykel"
@@ -7010,14 +7021,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "Gående"
@@ -7233,19 +7247,19 @@
 msgstr "Sprog"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr "Brug indbyggede standarder"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr ""
@@ -7376,37 +7390,11 @@
 msgstr "Proxyserver-kodeord"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Basis URLen for OSM serveren (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr "Login-navn (e-mail) til OSM-kontoen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Login-kodeord til OSM-kontoen. Efterlad blank for ikke at gemme noget "
-"kodeord."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "Grundlæggende URL til server"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr "OSM-brugernavn (e-mail)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "OSM-kodeord"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -7763,7 +7751,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "Kunne ikke læse \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -7868,7 +7856,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "Ukendt rolle \"{0}\"."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8026,23 +8014,49 @@
 msgstr "Ugyldig bz2-fil."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "Forkert brugernavn eller kodeord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Advarsel: Kodeordet sendes ukrypteret."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "Gem brugernavn og kodeord (ukrypteret)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "Indtast kodeord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
 msgstr "Login"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr "Login-navn (e-mail) til OSM-kontoen."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr ""
+"Login-kodeord til OSM-kontoen. Efterlad blank for ikke at gemme noget "
+"kodeord."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr "OSM-brugernavn (e-mail)"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "OSM-kodeord"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -8205,14 +8219,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "Ukendt medlemstype for \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "Forbereder OSM-data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr "Defekt id for punkt"
@@ -8667,5 +8681,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr "Beskrivelse"
@@ -9080,5 +9094,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr "Fejl ved indlæsning af fil"
@@ -9318,5 +9332,4 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
-#, fuzzy
 msgid ""
 "To enable the cadastre WMS plugin, change\n"
@@ -9324,6 +9337,4 @@
 "projection and retry"
 msgstr ""
-"Hvis du vil aktivere Cadastre-WMS-udvidelsen, så ret\n"
-"JOSM-projiceringen til Lambert og genstart"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9411,5 +9422,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -9945,7 +9956,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr "vand"
@@ -10119,7 +10130,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "navn"
+msgstr ""
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10673,12 +10683,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "start"
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0} punkt"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -10816,5 +10826,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr "Vejnavn"
@@ -11637,7 +11647,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr "bygning"
@@ -11651,5 +11661,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr "område"
@@ -11883,12 +11893,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "Vælg venligst rækken, der skal rettes."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "Gem WMS-lag"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
@@ -11901,7 +11909,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "Ingen ændringer at sende."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -11912,19 +11919,19 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr "Automatisk download"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS-lag ({0}), henter automatisk til zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS-lag ({0}), henter til zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -11933,42 +11940,42 @@
 "opløsningen."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr "Hent synlige tern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr "Skift opløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr "Genhent fejlagtige tern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr "Alpha-kanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr "Gem WMS-lag til fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr "Gem WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr "Hent WMS-lag fra fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr "Hent WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr "Fil format fejl"
@@ -12313,4 +12320,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12347,5 +12356,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr "Veje"
@@ -12356,5 +12365,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Motorvej"
@@ -12363,5 +12372,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr "Ret en motorvej"
@@ -12388,8 +12397,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr "Reference"
@@ -12430,21 +12439,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr "Lag"
@@ -12458,8 +12467,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr "Baner"
@@ -12477,15 +12486,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr "Maks. hastighed (km/t)"
@@ -12522,16 +12531,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr "Ensrettet"
@@ -12573,19 +12582,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Bro"
@@ -12621,19 +12630,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -12667,18 +12676,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr "Indhak"
@@ -12712,18 +12721,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr "Vold"
@@ -12731,5 +12740,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr "Motorvejsforbindelse"
@@ -12738,5 +12747,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr "Ret en motorvejsforbindelse"
@@ -12744,5 +12753,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr "Motortrafikvej"
@@ -12751,5 +12760,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr "Ret motortrafikvej"
@@ -12759,6 +12768,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr ""
@@ -12766,5 +12775,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr "Motortrafikvejsforbindelse"
@@ -12773,5 +12782,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr "Ret motortrafikvejsforbindelse"
@@ -12784,5 +12793,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Primær"
@@ -12791,5 +12800,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr "Ret en hovedvej"
@@ -12797,10 +12806,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr "Hovedforbindelse"
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr "Ret en hovedforbindelse"
@@ -12812,5 +12821,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Sekundær"
@@ -12820,5 +12829,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr "Ret en bivej"
@@ -12826,5 +12835,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr "Tertiær"
@@ -12834,5 +12843,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr "Ret en tertiær vej"
@@ -12844,5 +12853,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Uklassificeret"
@@ -12852,5 +12861,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr "Ret uklassificeret vej"
@@ -12877,19 +12886,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr "Bredde (meter)"
@@ -12901,5 +12910,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Beboelse"
@@ -12908,5 +12917,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr "Ret en beboelsesgade"
@@ -12930,13 +12939,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr "Overflade"
@@ -12956,20 +12965,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr "asfalteret"
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr "uasfalteret"
@@ -12977,12 +12986,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr "toppede brosten"
@@ -12990,5 +12999,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr ""
@@ -12997,5 +13006,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr ""
@@ -13003,5 +13012,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr "Service"
@@ -13010,5 +13019,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr "Ret servicevej"
@@ -13018,18 +13027,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr "gyde"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr ""
@@ -13037,5 +13046,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr "Parkeringsvej"
@@ -13045,5 +13054,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -13051,5 +13060,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr "Vej (ukendt type)"
@@ -13058,5 +13067,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr "Ret vej af ukendt type"
@@ -13065,20 +13074,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr "Adgangsbegrænsninger"
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr "Ret adgangsbegrænsninger"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr "Betalingsanlæg"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr "Blind vej"
@@ -13091,8 +13100,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr "Adgang"
@@ -13136,23 +13145,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr "ja"
@@ -13165,40 +13174,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr "privat"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr "designeret"
@@ -13211,19 +13220,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr "destination"
@@ -13246,65 +13255,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr "tilladt"
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr "landbrug"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr "nej"
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr "Varer"
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Lastbil"
@@ -13319,10 +13328,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr "Hest"
@@ -13338,13 +13347,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr "Motorcykel"
@@ -13360,30 +13369,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr "Motorkøretøj"
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr "Offentlig transport"
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr "Motorbåd"
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr "Båd"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr "Min. hastighed (km/t)"
@@ -13391,25 +13400,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr "Maks. vægt (ton)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr "Maks. højde (meter)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr "Maks. bredde (meter)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr "Maks. længde (meter)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr "Rundkørsel"
@@ -13420,5 +13429,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr "Ret trafikknudepunkt"
@@ -13440,9 +13449,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr "Type"
@@ -13462,10 +13471,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr "motorvej"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr "motorvejsforbindelse"
@@ -13487,10 +13496,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr "forbindelse"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr ""
@@ -13512,10 +13521,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr "primær"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr ""
@@ -13537,6 +13546,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr "sekundær"
@@ -13550,9 +13559,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr "tertiær"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr ""
@@ -13566,9 +13575,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr "beboelse"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr ""
@@ -13598,10 +13607,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr ""
@@ -13609,4 +13618,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13624,6 +13640,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr ""
@@ -13634,10 +13650,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr "Ret bro"
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr "Ret en tunnel"
@@ -13645,19 +13661,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr "Stier"
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr "Under udførelse"
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr "Ret vej under udførelse"
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr "Kryds"
@@ -13673,5 +13689,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr "rundkørsel"
@@ -13680,5 +13696,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr "Ridesti"
@@ -13686,5 +13702,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr "Ret ridesti"
@@ -13692,5 +13708,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr "Cykelsti"
@@ -13700,5 +13716,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr "Ret cykelsti"
@@ -13706,5 +13722,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr "Gangsti"
@@ -13713,5 +13729,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr "Ret gangsti"
@@ -13719,5 +13735,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr "Gågade"
@@ -13726,5 +13742,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr "Ret gågade"
@@ -13732,5 +13748,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr "Trin"
@@ -13740,5 +13756,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr "Ret trappetrin"
@@ -13747,5 +13763,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr "Spor"
@@ -13754,14 +13770,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr "Ret spor"
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr "beton"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr "grus"
@@ -13769,18 +13785,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr "jord"
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr "græs"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr "sand"
@@ -13788,5 +13804,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr "Spor-niveau 1"
@@ -13795,5 +13811,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr "Ret et spor af første niveau"
@@ -13801,5 +13817,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr "Spor-niveau 2"
@@ -13808,5 +13824,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr "Ret et spor af andet niveau"
@@ -13814,5 +13830,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr "Spor-niveau 3"
@@ -13821,5 +13837,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr "Ret et spor af tredje niveau"
@@ -13827,5 +13843,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr "Spor-niveau 4"
@@ -13834,5 +13850,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr "Ret et spor af fjerde niveau"
@@ -13840,5 +13856,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr "Spor-niveau 5"
@@ -13847,5 +13863,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr "Ret et spor af femte niveau"
@@ -13854,5 +13870,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr "Sti"
@@ -13861,13 +13877,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr "Ret sti"
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr "Motorslæde"
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr "Ski"
@@ -13875,5 +13891,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr "Vandring"
@@ -13883,5 +13899,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr "Ret vandring"
@@ -13889,5 +13905,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr "Bjergvandring"
@@ -13897,5 +13913,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr "Ret bjergvandring"
@@ -13903,5 +13919,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr "Krævende bjergvandring"
@@ -13911,5 +13927,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Ret krævende bjergvandring"
@@ -13917,5 +13933,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr "Alpevandring"
@@ -13925,5 +13941,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr "Ret alpevandring"
@@ -13931,5 +13947,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr "Krævende alpevandring"
@@ -13939,5 +13955,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Ret krævende alpevandring"
@@ -13945,5 +13961,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr "Hård alpevandring"
@@ -13953,5 +13969,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Ret hård alpevandring"
@@ -13959,10 +13975,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr "Vejpunkter"
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr "Motorvejskryds"
@@ -13970,15 +13986,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr "Ret motorvejskryds"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr "Tankstation"
@@ -13986,5 +14002,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr "Ret tankstation"
@@ -14019,14 +14035,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr "Selskab"
@@ -14035,5 +14051,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr "Færdselssignal"
@@ -14043,5 +14059,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr "Type af fodgængerfelt"
@@ -14050,27 +14066,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr "helleanlæg"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr ""
@@ -14078,6 +14094,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr ""
@@ -14086,11 +14102,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -14098,30 +14114,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr "fodgængerfelt"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr "fodgængerfelt med trafikstyring"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr "Stop"
@@ -14129,5 +14145,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr "Fodgængerfelt"
@@ -14136,14 +14152,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr "Mini-rundkørsel"
@@ -14154,14 +14170,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr "Retning"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr "i urets retning"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr "Vendeplads"
@@ -14171,20 +14187,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr "Bygrænse"
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr "Ret et bygrænse-skilt"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr "Fartkamera"
@@ -14192,5 +14208,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr "Nødtelefon"
@@ -14198,5 +14214,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr ""
@@ -14204,5 +14220,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr ""
@@ -14211,10 +14227,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr "Vadested"
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr "Ret vadested"
@@ -14222,5 +14238,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr "Bjergpas"
@@ -14228,5 +14244,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr "Ret bjergpas"
@@ -14238,7 +14254,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr "Højde"
@@ -14246,5 +14262,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr "Barrierer"
@@ -14252,5 +14268,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr "Pæl"
@@ -14258,5 +14274,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr "Ret en pæl"
@@ -14295,18 +14311,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr "Tilladt trafik:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr ""
@@ -14315,5 +14335,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr ""
@@ -14321,5 +14341,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr "Kreaturrist"
@@ -14327,10 +14347,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr "Ret en kreaturrist"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr "Bussluse"
@@ -14338,15 +14358,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr "Pigge"
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr "Betalingsanlæg"
@@ -14354,5 +14374,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr "Ret betalingsanlæg"
@@ -14360,10 +14380,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr "Grænsekontrol"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr "Ret grænsekontrol"
@@ -14373,5 +14393,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr "Hæk"
@@ -14380,5 +14400,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr "Hegn"
@@ -14387,5 +14407,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr "Mur"
@@ -14393,5 +14413,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr "Bymur"
@@ -14400,5 +14420,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr "Støttemur"
@@ -14410,15 +14430,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr "Indgang"
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr "Ret indgang"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr "Port"
@@ -14426,50 +14446,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr "Ret en port"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr "Skubbeport"
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr "Stente"
@@ -14477,15 +14497,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr "Ret en stente"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+#, fuzzy
+msgid "Turnstile"
+msgstr "Drejeskive"
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "Ret en stente"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr "Udfaldsport"
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr "Ret en udfaldsport"
@@ -14496,10 +14528,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr "Vand"
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr "Udspring"
@@ -14507,5 +14539,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr "Ret udspring"
@@ -14513,5 +14545,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr "Dræn"
@@ -14519,10 +14551,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr "Ret dræn"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr "Strøm"
@@ -14530,10 +14562,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr "Ret strøm"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr "Kanal"
@@ -14541,10 +14573,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr "Ret kanal"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr "Flod"
@@ -14554,5 +14586,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr "Ret flod"
@@ -14560,15 +14592,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr "Ret vand"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr "Ret land"
@@ -14576,15 +14608,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr "Vandreservoir"
@@ -14592,15 +14624,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr "Ret område for vandreservoir"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr "Overdækket reservoir"
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr "Ret overdækket reservoir"
@@ -14608,5 +14640,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr "Flodbred"
@@ -14615,10 +14647,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr "Ret flodbred"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr "Vådområde"
@@ -14629,14 +14661,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr "Ret vådområde"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr "Sump"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr "mose"
@@ -14650,35 +14682,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr "saltmarsk"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr "Mudder"
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr "Strand"
@@ -14686,20 +14718,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr "Ret strand"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr "Bugt"
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr "Ret bugt"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr "Klippe"
@@ -14707,10 +14739,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr "Ret klippe"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr "Kystlinje"
@@ -14718,5 +14750,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr "Ret kystlinje"
@@ -14724,5 +14756,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr "Færgerute"
@@ -14730,5 +14762,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr "Ret færge"
@@ -14737,5 +14769,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr ""
@@ -14743,10 +14775,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr "Dok"
@@ -14754,5 +14786,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr "Ret dok"
@@ -14760,5 +14792,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr "Dæmning"
@@ -14766,15 +14798,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr "Ret dæmning"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr "Vandvejs-punkt"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr ""
@@ -14783,5 +14815,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr ""
@@ -14789,20 +14821,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr "Vandfald"
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr "Ret vandfald"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr ""
@@ -14811,15 +14843,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr "Lystbådehavn"
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr "Ret lystbådehavn"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr "Mole"
@@ -14827,10 +14859,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr "Ret mole"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr "Færgehavn"
@@ -14838,10 +14870,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr "Ret færgehavn"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr "Slæbested"
@@ -14851,5 +14883,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr "Ret slæbested"
@@ -14857,10 +14889,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr "Jernbane"
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr "Spor"
@@ -14868,5 +14900,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr "Ret spor"
@@ -14896,8 +14928,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr "Valgfri typer"
@@ -14911,35 +14943,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr "sidespor"
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr "Monorail"
@@ -14947,45 +14979,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr "Ret monorail"
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr "Bevaret"
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr "Ret bevaret jernbane"
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr "Letbane"
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr "Ret letbane"
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr "Metro"
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr "Ret metro"
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr "Sporvogn"
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr "Ret sporvogn"
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr "Styreskinne til bus"
@@ -14993,5 +15025,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr "Ret styreskinne til bus"
@@ -15000,14 +15032,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr "Ubrugt jernbanespor"
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr "Ret ubrugt jernbanespor"
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr "Fjernet jernbane"
@@ -15016,5 +15048,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr "Jernbaneoverskæring"
@@ -15023,5 +15055,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr "Fodgængerovergang"
@@ -15031,5 +15063,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr ""
@@ -15037,5 +15069,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr "Drejeskive"
@@ -15044,10 +15076,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr "Luftvej"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr "Skilift"
@@ -15055,10 +15087,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr "Ret skilift"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr "Træklift"
@@ -15066,10 +15098,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr "Ret træklift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr "Tovbane"
@@ -15077,10 +15109,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr "Ret tovbane"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr ""
@@ -15088,5 +15120,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr ""
@@ -15094,5 +15126,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr "Station"
@@ -15103,10 +15135,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr "Ret station"
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr "Benzin"
@@ -15116,5 +15148,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr "Ret benzin"
@@ -15130,5 +15162,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15138,5 +15170,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr "Ret parkering"
@@ -15144,41 +15176,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr "Kapacitet"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr "overflade"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr "fleretages"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr "Handicapplads"
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr "Gebyr"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr "Vask"
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr "Ret bilvask"
@@ -15186,5 +15218,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr ""
@@ -15192,15 +15224,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr "Bilmekaniker"
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr "Ret bilmekaniker"
@@ -15208,5 +15240,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr "Udlejning"
@@ -15215,10 +15247,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr "Ret biludlejning"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr "Deling"
@@ -15226,5 +15258,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr ""
@@ -15232,5 +15264,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr "Ret cykelparkering"
@@ -15239,5 +15271,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr "Ret cykeludlejning"
@@ -15246,15 +15278,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr "Ret cykelhandler"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "Offentlig transport"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr "UIC-reference"
@@ -15262,5 +15294,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr "Jernbane-stop"
@@ -15268,5 +15300,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr "Ret stop"
@@ -15274,5 +15306,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr "Sporvogns-stop"
@@ -15281,5 +15313,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr "Ret sporvogns-stop"
@@ -15287,5 +15319,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr "Jernbaneplatform"
@@ -15294,5 +15326,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr "Redigér jernbaneplatform"
@@ -15304,5 +15336,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr "Spornummer"
@@ -15310,10 +15342,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr "Område"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr "Indgang til undergrundsbane"
@@ -15322,10 +15354,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr "Ret indgang til undergrundsbane"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr "kørestol"
@@ -15334,5 +15366,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr "Rutebilstation"
@@ -15341,5 +15373,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr "Ret rutebilstation"
@@ -15347,5 +15379,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr "Busstop"
@@ -15355,5 +15387,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr "Ret busstop"
@@ -15364,6 +15396,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr ""
@@ -15371,10 +15403,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr "Rutebil-platform"
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr "Ret rutebil-platform"
@@ -15382,5 +15414,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr "Taxi"
@@ -15388,5 +15420,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr "Ret taxiholdeplads"
@@ -15394,5 +15426,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr "Lufthavn"
@@ -15400,15 +15432,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr "Ret lufthavn"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr "ICAO"
@@ -15417,5 +15449,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr "Overnatning"
@@ -15427,5 +15459,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -15434,15 +15466,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr "Ret hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr "Stjerner"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr "Motel"
@@ -15450,20 +15482,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr "Ret motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr "Gæstehus"
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr "Ret gæstehus"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr "Feriehytte"
@@ -15471,10 +15503,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr "Ret feriehytte"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr "Vandrerhjem"
@@ -15482,30 +15514,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr "Ret vandrerhjem"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr "Alpin hytte"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr "Redigér alpin hytte"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr "Camping plads"
@@ -15513,10 +15545,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr "Redigér camping plads"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "Mad+drikke"
@@ -15527,5 +15559,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -15533,5 +15565,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr "Ret restaurant"
@@ -15539,5 +15571,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr "Køkken"
@@ -15545,61 +15577,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr "italiensk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr "kinesisk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr "græsk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr "tysk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr "indisk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr "tyrkisk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr "asiatisk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr "mexicansk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr "japansk"
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr "Fastfood"
@@ -15607,9 +15639,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr "Ret fastfood-restaurant"
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr "Café"
@@ -15617,10 +15649,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr "Ret café"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr "Pub"
@@ -15628,20 +15660,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr "Ret pub"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr "Ølhal"
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr "Redigér Ølhal"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr "Bar"
@@ -15649,10 +15681,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr "Redigér bar"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr "Natklub"
@@ -15660,20 +15692,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr "Ret natklub"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "Turisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr "Forlystelse"
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr "Ret forlystelse"
@@ -15682,11 +15714,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr "Åbningstider"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "Museum"
@@ -15694,10 +15726,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr "Ret museum"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "Zoo"
@@ -15706,10 +15738,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr "Ret zoo"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr "Udsigtspunkt"
@@ -15717,25 +15749,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr "Redigér udsigtspunkt"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr "Udkigstårn"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr "Forlystelsespark"
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr "Ret forlystelsespark"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr "Kunstværk"
@@ -15743,5 +15775,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr "Redigér kunstværk"
@@ -15749,5 +15781,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr "Informationskontor"
@@ -15755,80 +15787,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr "Redigér informationskontor"
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "Kort"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr "Kort type"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr "kort"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr "bykort"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr "vandrekort"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr "cykelkort"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
 msgid "Closer Description"
 msgstr "Nærmere beskrivelse"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1701
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Board Type"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "board"
 msgstr ""
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "history"
 msgstr "historie"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "nature"
 msgstr "natur"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "wildlife"
 msgstr "dyreliv"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Guidepost (Hiking)"
 msgstr ""
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr ""
@@ -15836,25 +15868,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr "Bålplads"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr "Picnic sted"
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr "Redigér picnic sted"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "Historiske steder"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "Borg"
@@ -15863,20 +15895,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr "Ret borg"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr "Ret ruiner"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr "Arkæologisk sted"
@@ -15885,10 +15917,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr "Ret arkæologisk sted"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr "Slagmark"
@@ -15896,5 +15928,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr "Ret slagmark"
@@ -15902,15 +15934,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr "Ret monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr "Mindesmærke"
@@ -15918,45 +15950,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr "Ret mindesmærke"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "Rekreation"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr "Badeland"
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr "Ret badeland"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "Legeplads"
@@ -15964,15 +15996,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr "Ret legeplads"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "Fiskeri"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr "Ret fiskeri"
@@ -15980,15 +16012,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr "Sportsfaciliteter"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr "Ret stadion"
@@ -16002,6 +16034,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "vælg sportsgren:"
@@ -16024,4 +16056,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -16082,5 +16122,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16090,5 +16138,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16234,5 +16282,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16338,5 +16386,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16377,29 +16425,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr "sport"
@@ -16409,227 +16458,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr "bueskydning"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr "atletik"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr "australsk fodbold"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr "petanque"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr "klatring"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr "kroket"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr "hundeløb"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr "ridning"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr "gymnastik"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr "travbane"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr "skydebane"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr "skating"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr "skisport"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "fodbold"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr "svømning"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr "Idrætscenter"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr "Ret idrætscenter"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr "Golfbane"
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr "Ret golfbane"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr "Ret minigolf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr "Multi"
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr "Ret multi"
@@ -16668,191 +16717,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr "bane"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr "Ret bowling"
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr "Atletik"
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr "Ret atletik"
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr "Bueskydning"
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr "Ret bueskydning"
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr "Klatring"
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr "Ret klatring"
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr ""
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr "Cykling"
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr "Redigér cykling"
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr "Hundeløb"
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr "Ret hundeløb"
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr "Ridning"
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr "Ret ridning"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr "Galopbane"
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr "Ret galopbane"
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr "Ret gymnastik"
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr "Ret motorsport"
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr "Skating"
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr "Ret skating"
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr "Ret Skateboard"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr "Svømning"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr "Ret svømning"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr "Skisport"
@@ -16860,56 +16909,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr "Ret skisport"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr "Sværhedsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr "nybegynder"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr "let"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr "avanceret"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr "Skydning"
@@ -16917,178 +16966,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr "Ret skydning"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr "Sport (bold)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr "Fodbold"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr "Ret fodbold"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr "Amerikansk fodbold"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr "Ret amerikansk fodbold"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr "Australsk fodbold"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr "Ret australsk fodbold"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr "Ret Baseball"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr "Ret Basketball"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr "Ret Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr "Golfbane"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr "Petanque"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr "Ret petanque"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr "Ret cricket"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr "Cricketnet"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr "Ret cricketnet"
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr "Kroket"
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr "Ret kroket"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr "Ret hockey"
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr "Ret pelota"
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr "Ret rugby"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr "Ret bordtennis"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr "Ret tennis"
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "Bygninger"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr "Bygning"
@@ -17096,5 +17145,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "Offentlig bygning"
@@ -17102,10 +17151,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr "Ret offentlig bygning"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "Rådhus"
@@ -17113,10 +17162,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "Ret rådhus"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "Ambassade"
@@ -17124,10 +17173,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "Ret ambassade"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "Domhus"
@@ -17136,10 +17185,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "Ret domhus"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "Fængsel"
@@ -17148,10 +17197,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "Ret fængsel"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "Politi"
@@ -17161,10 +17210,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "Ret politi"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "Brandstation"
@@ -17173,10 +17222,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "Ret brandstation"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "Posthus"
@@ -17184,5 +17233,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr "Ret posthus"
@@ -17190,15 +17239,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr "Børnehave"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr "Ret børnehave"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "Skole"
@@ -17206,10 +17255,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "Ret skole"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr "Universitet"
@@ -17217,10 +17266,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr "Ret universitet"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr ""
@@ -17228,5 +17277,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr ""
@@ -17234,5 +17283,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "Biograf"
@@ -17241,10 +17290,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "Ret biograf"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "Bibliotek"
@@ -17253,10 +17302,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "Ret bibliotek"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr "Kunstcenter"
@@ -17264,10 +17313,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr "Redigér kunstcenter"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "Teater"
@@ -17276,10 +17325,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "Ret teater"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr "Sted for tilbedelse"
@@ -17289,5 +17338,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr "Ret sted for tilbedelse"
@@ -17296,6 +17345,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr "Religion"
@@ -17304,66 +17353,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr "buddhistisk"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr "kristen"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr "hinduistisk"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr "jainistisk"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr "jødisk"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr "muslimsk"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr "spiritistisk"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr "taoistisk"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr "unitar"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr "zoroastristisk"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr "Trosretning"
@@ -17372,81 +17421,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr "anglikansk"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr "baptistisk"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr "katolsk"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr "evangelisk"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr "Jehovas Vidner"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr "luthersk"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr "metodistisk"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr "mormonsk"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr "ortodoks"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr "pinsebevægelsen"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr "prebyteriansk"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr "protestantisk"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr "kvæker"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr "shiitisk"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr "sunnitisk"
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr "Adresser"
@@ -17455,5 +17504,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr "Ret adresseinformation"
@@ -17461,5 +17510,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr "Husnummer"
@@ -17467,20 +17516,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr "Husnavn"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr "Bynavn"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr "Landekode"
@@ -17488,5 +17537,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr "Adresse-interpolering"
@@ -17495,5 +17544,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr "Ret adresse-interpolering"
@@ -17501,71 +17550,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr "Nummereringssystem"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr "ulige"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr "lige"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr "alle"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr "alfabetisk"
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr "Menneskeskabt"
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr "Fabrik"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr "Ret fabrik"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "Tårn"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "Ret tårn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "Vandtårn"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "Ret vandtårn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr "Gasbeholder"
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr "Ret gasbeholder"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "Fyrtårn"
@@ -17573,10 +17622,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "Ret fyrtårn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "Vejrmølle"
@@ -17584,10 +17633,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "Ret vejrmølle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "Rørledning"
@@ -17595,10 +17644,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "Ret rørledning"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr "Rensningsanlæg"
@@ -17608,10 +17657,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr "Ret rensningsanlæg"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr "Kran"
@@ -17619,10 +17668,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr "Ret kran"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr "Pejlemærke"
@@ -17630,10 +17679,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr "Ret Pejlemærke"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr ""
@@ -17641,10 +17690,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr "Overvågning"
@@ -17652,5 +17701,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr "Ret overvågningskamera"
@@ -17658,5 +17707,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr "Generator"
@@ -17666,39 +17715,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr "Ret generator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr "vind"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr "vand"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr "arom"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr "kul"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr "sol"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr "gas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr "Kraftværk"
@@ -17707,10 +17756,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr "Ret kraftværk"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -17719,5 +17768,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr "Ret transformatorstation"
@@ -17725,10 +17774,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr "Elmast"
@@ -17739,5 +17788,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr "Ret elmast"
@@ -17745,5 +17794,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr "Strømkabel"
@@ -17752,25 +17801,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr "Ret strømkabel"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr "Spænding"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr "Antal kabler"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr "Faciliteter"
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "Toiletter"
@@ -17778,20 +17827,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr "Postkasse"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "Telefon"
@@ -17800,5 +17849,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr "Ret telefon"
@@ -17806,5 +17855,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "Mønter"
@@ -17812,5 +17861,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr "Sedler"
@@ -17818,5 +17867,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -17824,5 +17873,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr ""
@@ -17830,15 +17879,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr "Genbrug"
@@ -17847,5 +17896,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr "Ret genbrugsplads"
@@ -17853,35 +17902,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr "Dåser"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr "Tøj"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr "Papir"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr "Skrotjern"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr "Bænk"
@@ -17890,20 +17939,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr "Skydetelt"
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr "Ret skydetelt"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr "Skjul"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr "Lås"
@@ -17911,22 +17960,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr "Højde"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr "lav"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr "fuld"
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr "Springvand"
@@ -17935,10 +17984,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr "Ret springvand"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "Vandpost"
@@ -17947,10 +17996,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "Ret vandpost"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr "Babyluge"
@@ -17958,25 +18007,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr "Ret babyluge"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "Butikker"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr "Supermarked"
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr "Ret supermarked"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr "Købmand"
@@ -17984,10 +18033,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr "Ret købmand"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -17995,10 +18044,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr "Ret kiosk"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "Automat"
@@ -18006,5 +18055,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "Ret automat"
@@ -18012,88 +18061,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "Varer i automat"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr "P-automat"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr "mad"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "drikke"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr "cigaretter"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr "billeder"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr "dyremad"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "aviser"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "legetøj"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr "frimærker"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr "tamponer"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr "høm-høm-pose"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "Slagter"
@@ -18101,10 +18150,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "Ret slagter"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "Bager"
@@ -18112,10 +18161,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "Ret bager"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr "Blomsterhandler"
@@ -18123,20 +18172,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr "Ret blomsterhandler"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr ""
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr "Sprit"
@@ -18144,60 +18193,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr "Redigér spritbutik"
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr "Drikkevarer"
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr "Redigér drikkevarebutik"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr "Computer"
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr "Ret computerforretning"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr "Elektronik"
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr "Ret elektronikforretning"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr "Hi-fi"
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr "Ret hi-fi-forhandler"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr "Møbelforretning"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr "Ret møbelforretning"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr "Havecenter"
@@ -18205,10 +18254,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr "Redigér havecenter"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr ""
@@ -18216,10 +18265,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr "Gør-det-selv-butik"
@@ -18227,60 +18276,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr "Ret gør-det-selv-butik"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr ""
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr "Frisør"
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr "Ret frisør"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr "Sko"
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr "Ret skobutik"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr "Legetøjsbutik"
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr "Redigér legetøjsbutik"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr "Video"
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr "Redigér videobutik"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "Kemisk renseri"
@@ -18288,10 +18337,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "Ret kemisk renseri"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "Vaskeri"
@@ -18299,10 +18348,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "Ret vaskeri"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr ""
@@ -18310,35 +18359,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr "Sport"
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr "Ret sportsbutik"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr "Optiker"
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr "Ret optiker"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "Penge"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "Bank"
@@ -18346,5 +18395,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "Ret bank"
@@ -18352,10 +18401,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "Pengeautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr "Vekselkontor"
@@ -18363,5 +18412,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr "Ret vekselkontor"
@@ -18369,15 +18418,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "Ret pengeautomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "Sundhed"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr "Lægehus"
@@ -18385,20 +18434,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr "Ret lægehus"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr "Tandlæge"
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr "Ret tandlæge"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -18406,5 +18455,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "Ret apotek"
@@ -18412,10 +18461,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr "Håndkøb"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "Hospital"
@@ -18423,10 +18472,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "Ret Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr ""
@@ -18435,5 +18484,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -18442,20 +18491,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(brug forvalgskode, fx +12-345-67890)"
@@ -18463,5 +18512,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr "Dyrlæge"
@@ -18470,56 +18519,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr "Ret dyrlæge"
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr "Ret et kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr "Ret land"
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr "Stat"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr "Ret stat"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr "Region"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr "Ret region"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr "Amt"
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr "Ret amt"
@@ -18527,15 +18575,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr "By"
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr "Ret by"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr "Mindre by"
@@ -18543,10 +18591,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr "Ret mindre by"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr "Forstad"
@@ -18554,25 +18602,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr "Ret forstad"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "By"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "Ret by"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr "Landsby"
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr "Ret landsby"
@@ -18580,5 +18628,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr "Egn"
@@ -18586,10 +18634,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr "Ret lokalitet"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "Ø"
@@ -18597,5 +18645,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "Ret ø"
@@ -18603,5 +18651,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr "Huleindgang"
@@ -18609,10 +18657,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr "Ret huleindgang"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "Tinde"
@@ -18620,10 +18668,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "Ret tinde"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr "Gletsjer"
@@ -18631,10 +18679,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr "Ret gletsjer"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr "Vulkan"
@@ -18642,70 +18690,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr "Ret vulkan"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr "Grænser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr "National"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr "Ret landegrænser"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr "Administrativt"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr "Ret administrativ grænse"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr "Civil"
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr "Ret civil-grænse"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr "Politisk"
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr "Ret politisk grænse"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr "Nationalpark"
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr "Ret grænser for nationalpark"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr "Brug af land"
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "Træ"
@@ -18714,15 +18762,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "Ret et træ"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr "Botanisk navn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr "Skov"
@@ -18731,5 +18779,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr "Ret skov"
@@ -18737,17 +18785,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr "Nåleskov"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr "Løvskov"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr "blandet"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "Skov"
@@ -18756,14 +18804,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr "Ret skovområde"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr "Ret naturreservat"
@@ -18771,25 +18819,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr "Ur"
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr "Ret ur"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr "Krat"
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr "Ret krat"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr "Højdedrag"
@@ -18797,10 +18845,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr "Ret højdedrag"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr "Hede"
@@ -18808,5 +18856,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr "Ret hede"
@@ -18814,5 +18862,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr "Gårdsplads"
@@ -18821,45 +18869,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr "Ret gårdsplads"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr "Eng"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr "Ret vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr "Kolonihaver"
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr "Ret kolonihave-område"
@@ -18867,25 +18915,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr "Have"
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr "Ret have"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr "Græs"
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr ""
@@ -18893,10 +18941,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr ""
@@ -18904,20 +18952,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr "Ret park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr "Rekreativt område"
@@ -18925,5 +18973,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr "Ret rekreativt område"
@@ -18931,15 +18979,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr "Beboelseområde"
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr "Kirkegård"
@@ -18947,9 +18995,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr "Ret kirkegård"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr "Kirkegård"
@@ -18957,39 +19005,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr "Ret kirkegård"
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr "Detailhandel"
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr "Ret område for detailhandel"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr "Industri"
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr "Ret industri-område"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr ""
@@ -18997,15 +19045,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr "Militært område"
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr "Ret militært område"
@@ -19013,55 +19061,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr "Byggeplads"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr "Ret område for byggeplads"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr "Stenbrud"
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr "Ret stenbrudsområde"
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -19071,5 +19119,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr "Ret multipolygon"
@@ -19078,10 +19126,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr "ydre segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr "indre segment"
@@ -19089,5 +19137,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr ""
@@ -19096,5 +19144,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -19102,34 +19150,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr ""
@@ -19138,15 +19186,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr ""
@@ -19154,5 +19202,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr "Rute"
@@ -19161,5 +19209,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr "Ret rute"
@@ -19167,5 +19215,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr ""
@@ -19237,24 +19285,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr "cykel"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr "vej"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr "færge"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr "ski"
@@ -19307,20 +19355,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr "fod"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr "vandre"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr "omvej"
@@ -19334,10 +19382,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr "undergrundsbane"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr "Symbol beskrivelse"
@@ -19345,26 +19393,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr "Netværk"
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "Roter"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr "foreslået"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr "midlertidig"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr "forbindelse"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr "Farve (hex)"
@@ -19373,30 +19427,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr "rute-segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr ""
@@ -19432,6 +19486,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19447,5 +19502,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19464,5 +19527,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr ""
@@ -19556,7 +19619,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr "bro"
@@ -19821,15 +19884,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr ""
@@ -19871,5 +19934,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr "hest"
@@ -20007,4 +20070,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20016,5 +20085,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20022,5 +20091,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20057,5 +20126,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20079,11 +20148,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr ""
@@ -20107,5 +20176,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20146,5 +20215,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20182,6 +20251,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr "gade"
@@ -20237,7 +20306,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr ""
@@ -20290,11 +20359,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr "bane"
@@ -20315,5 +20392,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr ""
@@ -20327,5 +20404,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr ""
@@ -20346,5 +20423,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr ""
@@ -20358,6 +20435,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr ""
@@ -20372,5 +20449,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr "flodbred"
@@ -20384,5 +20461,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr ""
@@ -20396,5 +20473,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr ""
@@ -20422,5 +20499,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr "akvædukt"
@@ -20563,5 +20640,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20588,13 +20665,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr "menneskeskabt"
@@ -20656,7 +20733,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr ""
@@ -20679,10 +20756,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr ""
@@ -20718,7 +20795,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr ""
@@ -20763,6 +20840,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr ""
@@ -20776,5 +20853,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr "terminal"
@@ -20796,5 +20873,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr ""
@@ -20808,5 +20885,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr ""
@@ -20814,4 +20891,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20854,7 +20938,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr ""
@@ -20871,5 +20955,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr ""
@@ -20884,5 +20968,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr ""
@@ -20897,5 +20981,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr ""
@@ -20910,5 +20994,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr ""
@@ -20923,5 +21007,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr ""
@@ -20936,5 +21020,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr ""
@@ -20957,4 +21041,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -20965,4 +21056,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -21039,10 +21138,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr ""
@@ -21056,5 +21156,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr ""
@@ -21068,5 +21168,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr "rørledning"
@@ -21194,12 +21294,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr "rekreation"
@@ -21213,5 +21313,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr "marina"
@@ -21283,8 +21383,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr ""
@@ -21386,10 +21486,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr ""
@@ -21409,4 +21509,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21428,4 +21535,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21749,4 +21863,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -21773,24 +21895,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr ""
@@ -21822,6 +21952,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr ""
@@ -21882,8 +22012,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr "helbred"
@@ -22236,26 +22366,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr "butik"
@@ -22310,5 +22440,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22327,8 +22457,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr "hotel"
@@ -22478,9 +22608,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr "turisme"
@@ -22552,8 +22682,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr "historisk"
@@ -22624,8 +22754,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr ""
@@ -22639,5 +22769,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr "stenbrud"
@@ -22651,5 +22781,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr ""
@@ -22671,5 +22801,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr ""
@@ -22683,5 +22813,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr "skov"
@@ -22695,5 +22825,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr ""
@@ -22716,5 +22846,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr ""
@@ -22728,5 +22858,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr "industri"
@@ -22740,5 +22870,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr ""
@@ -22752,5 +22882,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr ""
@@ -22764,5 +22894,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr ""
@@ -22819,7 +22949,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr "militær"
@@ -22833,5 +22963,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr "kirkegård"
@@ -22844,5 +22974,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr ""
@@ -22857,5 +22987,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr "gletsjer"
@@ -22869,5 +22999,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr "vulkan"
@@ -22922,8 +23052,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr ""
@@ -22937,5 +23067,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr "buskads"
@@ -22949,5 +23079,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr "hede"
@@ -22961,5 +23091,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr "træ"
@@ -22973,5 +23103,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr ""
@@ -22985,5 +23115,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr "strand"
@@ -23061,8 +23191,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr ""
@@ -23110,7 +23240,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr "grænse"
@@ -23252,10 +23382,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr "sted"
@@ -23303,6 +23433,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr "adresse"
@@ -23599,18 +23729,6 @@
 msgstr ""
 
-#~ msgid "Unknown file extension."
-#~ msgstr "Ukendt filtype."
-
 #~ msgid "Move"
 #~ msgstr "Flyt"
-
-#~ msgid "Invalid projection"
-#~ msgstr "Ugyldig projicering"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Skift først projiceringen til {0}."
-
-#~ msgid "end"
-#~ msgstr "slut"
 
 #~ msgid ""
@@ -23710,7 +23828,4 @@
 #~ msgstr "min udgave:"
 
-#~ msgid "Rotate"
-#~ msgstr "Roter"
-
 #~ msgid "Change"
 #~ msgstr "Skift"
@@ -23773,4 +23888,7 @@
 #~ msgid "Validate either current selection or complete dataset."
 #~ msgstr "Validér enten den nuværende selektion eller det fulde datasæt"
+
+#~ msgid "end"
+#~ msgstr "slut"
 
 #~ msgid "Click Reload to refresh list"
@@ -23863,4 +23981,7 @@
 #~ msgid "Delete and Download"
 #~ msgstr "Slet og hent"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Ukendt filtype."
 
 #~ msgid ""
@@ -23986,4 +24107,10 @@
 #~ "Upload ikke noget data efter denne besked."
 
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Skift først projiceringen til {0}."
+
+#~ msgid "Invalid projection"
+#~ msgstr "Ugyldig projicering"
+
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
Index: /applications/editors/josm/i18n/po/de.po
===================================================================
--- /applications/editors/josm/i18n/po/de.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/de.po	(revision 17069)
@@ -9,6 +9,6 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
-"PO-Revision-Date: 2009-08-10 14:06+0200\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
+"PO-Revision-Date: 2009-08-15 14:02+0200\n"
 "Last-Translator: Dirk Stöcker <openstreetmap@dstoecker.de>\n"
 "Language-Team: Deutsch\n"
@@ -17,5 +17,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-10 11:57+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:38+0000\n"
 "X-Generator: KBabel 1.11.4\n"
 
@@ -59,6 +59,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -68,5 +68,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -103,6 +103,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "Fehler"
@@ -113,5 +113,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "Ungespeicherte Änderungen"
@@ -131,10 +131,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -151,15 +151,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -189,6 +189,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -218,5 +218,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -379,5 +379,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
 msgstr "Vereinen"
@@ -389,4 +389,6 @@
 "</html>"
 msgstr ""
+"<html>Es gibt keine Ebene mit der die Ausgangsebene<br>''{0}''<br>vereint "
+"werden könnte.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
@@ -461,9 +463,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -496,7 +498,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -585,37 +587,37 @@
 "({2})"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "Daten"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "Ebene"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "Auswahl"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "Konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "heruntergeladene Daten"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Auf {0} zoomen"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Ansicht auf {0} zoomen"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -625,30 +627,30 @@
 msgstr "Anzeige: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "Nichts ausgewählt, auf das gezoomt werden kann."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "Keine Konflikte, auf die gezoomt werden kann."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "Weg verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "Mehrere Wege zu einem verbinden."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "Bitte wählen Sie mindestens zwei Wege zum Verbinden."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr "Wege mit unterschiedlicher Mitgliedschaft verbinden?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -658,13 +660,13 @@
 "wirklich verbunden werden?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "Trotzdem verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "Richtungen ändern?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -674,10 +676,10 @@
 "Möchten Sie, dass einige Richtungen gedreht werden?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "Drehen und Verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -685,20 +687,20 @@
 msgstr "Werte für alle Konflikte festlegen."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Konflikte auflösen"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "{0} Wege verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "Alle Wege sind leer"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -747,6 +749,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -768,6 +770,6 @@
 msgstr "Ausgewählte Objekte löschen."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -777,5 +779,5 @@
 msgstr "Überschreiben"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -907,7 +909,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "Die Daten ins GPX-Format exportieren."
+msgstr "GPX-Datei exportieren"
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -923,5 +924,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -939,5 +940,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -1011,22 +1012,22 @@
 msgstr "Aktuelle Ebene mit einer anderen zusammenführen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "Knotenpunkte vereinigen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "Mehrere Knotenpunkte zum ältesten vereinigen."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "Bitte mindestens zwei Knotenpunkte zum Vereinigen wählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr "Knotenpunkte mit unterschiedlicher Mitgliedschaft vereinen?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1036,9 +1037,9 @@
 "wirklich vereint werden?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "Trotzdem vereinen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -1046,5 +1047,5 @@
 "gelöscht werden."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1263,4 +1264,6 @@
 msgid "Warning: failed to put a dialog always on top. Exception was: {0}"
 msgstr ""
+"Warnung: Dialog konnte nicht in den Vordergrund gebracht werden. "
+"Fehlermeldung ist: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
@@ -1303,7 +1306,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "Keine Überschneidung gefunden. Es wurde nichts geändert."
+msgstr "Keine Exportfunktion gefunden! Es wurde nichts gespeichert."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1475,4 +1477,6 @@
 "should verify this and correct it when necessary.</html>"
 msgstr ""
+"<html>Eine rollenbasierte Relations-Mitgliedschaft wurde in alle neuen Wege "
+"kopiert.<br>Sie sollten dies überprüfen und falls nötig korrigieren.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
@@ -1481,4 +1485,6 @@
 "this and correct it when necessary.</html>"
 msgstr ""
+"<html>Alle neuen Wege wurden Element in einer Relation gemacht.<br>Sie "
+"sollten dies überprüfen und falls nötig korrigieren.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
@@ -1626,5 +1632,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
 msgid "Didn't find a primitive with id {0} in the current dataset"
-msgstr ""
+msgstr "Kein Objekt mit der ID {0} im aktuellen Datensatz gefunden"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
@@ -1755,4 +1761,6 @@
 "changed primitive"
 msgstr ""
+"Zum Hochladen aller Änderungen mit nur einer Anfrage aktivieren. "
+"Deaktivieren zur Nutzung eine Anfrage je geändertem Objekt."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464
@@ -1888,4 +1896,6 @@
 msgid "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr ""
+"Der Fehler wird ignoriert, da das Herunterladen abgebrochen wurde. Die "
+"Fehlermeldung war: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
@@ -1910,4 +1920,6 @@
 msgid "The following errors occurred during mass download:{0}"
 msgstr ""
+"Die folgenden Fehler sind während des kombinierten Herunterladens "
+"aufgetreten:{0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
@@ -1915,5 +1927,5 @@
 msgstr "Fehler beim Herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1931,5 +1943,5 @@
 "ignorieren<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr "Gelöschte oder verschobene Objekte"
@@ -1968,11 +1980,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2112,5 +2124,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2189,5 +2201,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Nach Objekten suchen."
@@ -2316,5 +2328,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Suche"
@@ -2499,4 +2511,6 @@
 "conflict can't be added.</html>"
 msgstr ""
+"<html>Ebene ''{0}'' enthält bereits einen Konflikt für Objekt<br>''{1}''."
+"<br>Dieser Konflikt kann nicht hinzugefügt werden.</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
@@ -2511,13 +2525,15 @@
 "primitmive ''{1}''"
 msgstr ""
+"Warnung: Die Ebene \"{0}\" existiert nicht mehr. Kann Konflikt für Objekt "
+"\"{1}\" nicht entfernen"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
 #, java-format
 msgid "Add conflict for ''{0}''"
-msgstr ""
+msgstr "Konflikt für \"{0}\" hinzufügen"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2562,5 +2578,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr "Aus der Relation entfernen"
@@ -2602,9 +2618,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "{0} Knotenpunkte vereinigen"
-msgstr[1] "{0} Knotenpunkte vereinigen"
+msgstr[0] "{0} Knoten bewegen"
+msgstr[1] "{0} Knoten bewegen"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2646,5 +2662,5 @@
 msgid_plural "Rotate {0} nodes"
 msgstr[0] "{0} Knoten drehen"
-msgstr[1] "{1} Knoten drehen"
+msgstr[1] "{0} Knoten drehen"
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2820,5 +2836,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2865,5 +2881,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2898,5 +2914,5 @@
 msgstr "Als Parameter \"{0}\" wurde \"{1}\" übergeben. Das ist keine gültige Klasse."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2910,5 +2926,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "Eisenbahn"
@@ -2923,5 +2939,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3146,5 +3162,5 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
 msgid "Gauss-Laborde Réunion 1947"
-msgstr ""
+msgstr "Gauss-Laborde Réunion 1947"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111
@@ -3185,13 +3201,13 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
 msgid "UTM20N Guadeloupe Fort-Marigot 1949"
-msgstr ""
+msgstr "UTM20N Guadeloupe Fort-Marigot 1949"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
 msgid "UTM20N Guadeloupe Ste-Anne 1948"
-msgstr ""
+msgstr "UTM20N Guadeloupe Ste-Anne 1948"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
 msgid "UTM20N Martinique Fort Desaix 1952"
-msgstr ""
+msgstr "UTM20N Martinique Fort Desaix 1952"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
@@ -3203,5 +3219,5 @@
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr ""
+msgstr "<html>Konnte Lesezeichen nicht schreiben.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3209,5 +3225,5 @@
 msgstr "Nicht noch einmal zeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3218,5 +3234,5 @@
 "Prüfen Sie die Server-URL in Ihren Einstellungen und Ihre Internetverbindung."
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3229,10 +3245,10 @@
 "{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr "Vorbedingung nicht erfüllt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3240,25 +3256,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "unbekannt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3267,10 +3283,13 @@
 "applet and because you didn''t load your applet from ''{1}''.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+"<html>Der Sicherheitskontext erlaubt keine Verbindung zum Server<br>''{0}''."
+"<br>Wahrscheinlich haben Sie JOSM als applet gestartet, und dieses "
+"Applet<br>nicht von ''{1}'' geladen.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr "Sicherheitsausnahme"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3279,9 +3298,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr "Netzwerkausnahme"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+msgid "IO Exception"
+msgstr "Ein-/Ausgabefehler"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3291,9 +3321,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "Rechner unbekannt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3306,5 +3336,5 @@
 "<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr "Objekt bereits gelöscht"
@@ -3396,10 +3426,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "Benutzername"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "Passwort"
@@ -3604,15 +3634,15 @@
 msgstr "(kein Objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "Ebene nicht in der Liste."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Ebene ''{0}'' muss in der Liste der Ebenen sein"
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid "Warning: failed to put option pane dialog always on top. Exception was: {0}"
@@ -3666,5 +3696,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr "Meine mit Deren"
@@ -3673,5 +3703,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr "Meine mit Vereinigt"
@@ -3680,20 +3710,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr "Deren mit Vereinigt"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr "Role {0} nimmt nicht an dem Vergleichspaar {1} teil."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3703,6 +3733,6 @@
 msgstr "Merkmale"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3710,6 +3740,6 @@
 msgstr "Knoten"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3717,23 +3747,23 @@
 msgstr "Elemente"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr "Keine verbleibenden Merkmalskonflikte zu beheben"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "Merkmale({0} Konflikte)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr "{0} verbleibende Merkmalskonflikte zu beheben"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr "Knoten(gelöst)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
@@ -3741,17 +3771,17 @@
 "Knotenliste des Weges."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "Knoten(mit Konflikten)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr "Verbleibende Konflikte in der Knotenliste des Weges"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "Elemente(gelöst)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3761,74 +3791,74 @@
 "Elementenliste der Relation."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "Elemente(mit Konflikten)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr "Verbleibende Konflikte in der Elementenliste der Relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr "Keine verbleibenden Eigenschaftskonflikte"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "Eigenschaften(mit Konflikten)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr "Verbleibende Eigenschaftskonflikte zu beheben"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "Konfliktlösung"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr "Parameter \"current\" außerhalb des Bereichs: Wert ist {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr "Liste in Role {0} nimmt aktuell nicht an einem Vergleichspaar teil."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr "Parameter \"index\" hat unerwarteten Wert {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr "Element {0} nicht in der Liste gefunden"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr "Synchron Rollen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr "Vergleichen "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr "Meine Version"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr "Liste der Elemente in meinem (dem lokalen) Datensatz"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr "Vereinigte Version"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3838,30 +3868,30 @@
 "hierdurch ersetzt, wenn die Änderungen bestätigt werden."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr "Deren Version"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr "Liste der Elemente in deren (dem Server-) Datensatz"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr "> Kopf"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr "Kopiere meine gewählten Knoten an den Anfang der Liste vereinigter Knoten."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr "> Fuß"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr "Kopiere meine gewählten Elemente an das Ende der Liste vereinigter Elemente."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3871,5 +3901,5 @@
 "vereinigter Elemente."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3879,5 +3909,5 @@
 "Liste vereinigter Elemente."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
@@ -3885,9 +3915,9 @@
 "Elemente."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr "Kopiere deren gewählte Elemente an das Ende der Liste vereinigter Elemente."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3897,5 +3927,5 @@
 "vereinigter Elemente."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3905,21 +3935,21 @@
 "der vereinigten Liste."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr "Hoch"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr "Den ausgewählten Eintrag eine Position nach oben schieben."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr "Runter"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr "Den ausgewählten Eintrag eine Position nach unten schieben."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3928,32 +3958,32 @@
 msgstr "Entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr "Lösche die ausgewählten Einträge aus der Liste der vereinigten Elemente."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr "Fixieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr "Aktuelle Liste der vereinigten Elemente fixieren."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr "Fixierung aufheben"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr "Fixierung der aktuellen Liste der vereinigten Elemente aufheben."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid "<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
 msgstr "<html>Wähle <strong>{0}</strong> um das Vereinigen zu beginnen.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3962,5 +3992,5 @@
 msgstr "<html>Wähle <strong>{0}</strong> um das Vereinigen abzuschließen.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3969,5 +3999,5 @@
 msgstr[1] "Meine Version ({0} Einträge)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3976,5 +4006,5 @@
 msgstr[1] "Vereinigte Version ({0} Einträge)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -3983,21 +4013,21 @@
 msgstr[1] "Deren Version ({0} Einträge)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -4007,5 +4037,5 @@
 msgstr "Parameter \"{0}\" darf nicht NULL sein."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -4017,5 +4047,5 @@
 "Anpassung nicht setzen."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -4023,9 +4053,9 @@
 msgstr "Anpassung {0} ist noch nicht registriert."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr "Knoten"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4034,10 +4064,10 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr "Unerwarteter Spaltenindex ({0})"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -4046,19 +4076,19 @@
 msgstr "<html>Fehler bei der Kommunikation mit dem Server<br>Details: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr "Fehler bei der Kommunikation mit dem Server"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr "Ja, auch wiederherstellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr "Nein, Operation abbrechen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -4070,9 +4100,9 @@
 "wiederhergestellt werden?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr "Zusätzliche Knoten wiederherstellen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -4085,13 +4115,13 @@
 "wiederhergestellt werden?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr "Abhängige Objekte wiederherstellen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr "Eigenschaften in meinem Datensatz (lokaler Datensatz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -4101,90 +4131,90 @@
 "eigenen Elements ersetzen, wenn die Vereinigung angewendet wird."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr "Eigenschaften in deren Datensatz (Serverdatensatz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr "Koordinaten:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr "Löschstatus:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr "Löschstatus:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr "(nichts)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "gelöscht"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr "nicht gelöscht"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr "Sichtbar (auf Server)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr "nicht sichtbar (auf dem Server)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr "Exakte Kopie der lokalen Version behalten"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr "Aus dem lokalen Datensatz löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr "Behalte meine Koordinaten"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr "Behalte  Server-Koordinaten"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr "Nicht aufgelöster Konflikt durch unterschiedliche Koordinaten."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr "Behalte den Löchstatus der  lokalen Daten."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr "Behalte den Löchstatus der Server-Daten."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr "Nicht aufgelöster Konflikt durch unterschiedlichen Löschstatus."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr "Übernehme meinen Löschstatus"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr "Ja, diese ID zurücksetzten"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr "Nein, abbrechen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4197,17 +4227,17 @@
 "neue ID zuteilen.<br>Sind Sie hiermit einverstanden?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr "ID auf 0 zurücksetzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr "Übernehme deren Löschstatus"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr "Ja, Entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4218,14 +4248,14 @@
 "damit einverstanden?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr "Aus dem Datensatz löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr "Löschstatus ist unterschiedlich."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4233,10 +4263,10 @@
 msgstr "Rolle"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr "Objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4244,12 +4274,12 @@
 "ausgeführt werden."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4257,14 +4287,14 @@
 msgstr "<undefiniert>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr "Vereinigte Daten beinhalten keine Merkmale mit dem Schlüssel {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4272,7 +4302,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4284,7 +4314,7 @@
 msgstr "Schlüssel"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4297,45 +4327,45 @@
 msgstr "Wert"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr "Kann unentschiedenes Merkmalselement nicht anwenden"
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr "Parameter \"col\" darf nur die Werte 0 oder 1 annehmen (col={0})."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr "Meine Version (lokale Daten)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr "Deren Version (Serverdaten)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ">"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Behalte die ausgewählten Schlüssel/Wert-Kombination der lokalen Daten."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr "Behalte die ausgewählten Schlüssel/Wert-Kombination der Server-Daten."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr "Unentschieden"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr "Markiere das gewählte Merkmal als unentschieden"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4355,8 +4385,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4393,5 +4423,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid "Set the selected elements on the map to the selected items in the list above."
@@ -4447,5 +4477,5 @@
 #, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr ""
+msgstr "Konflikte lösen für ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4496,83 +4526,83 @@
 msgstr "History der markierten Elemente anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "Ebenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "Liste aller geladenen Ebenen öffnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "Ausgewählte Ebene löschen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+msgstr "In Ebene ''{0}'' gibt es ungespeicherte Änderungen. Ebene trotzdem löschen?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr "Ebene löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr "Wollen Sie die Ebene ''{0}'' wirklich löschen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr "Bestätigung"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr "Ja"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr "Nein"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr "Alle löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr "Lösche Ebene {0} von {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "Anzeigen/Ausblenden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "Sichtbarkeit der Ebene umschalten."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
 msgid "Activate"
 msgstr "Aktivieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate the selected layer"
 msgstr "Die ausgewählte Ebene aktivieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr "Aktuelle Eben mit einer anderen Ebene verbinden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "Gewählte Ebene eine Zeile nach oben verschieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "Gewählte Ebene eine Zeile nach unten verschieben."
@@ -4582,6 +4612,6 @@
 msgstr "Ebeneninformation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4590,27 +4620,27 @@
 msgstr[1] "Damit werden maximal {0} Objekte geändert."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "Ein leerer Wert löscht den Schlüssel."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<unterschiedlich>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "Werte ändern?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid "Warning: failed to put properties dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4619,40 +4649,40 @@
 msgstr[1] "Ändere Eigenschaften für bis zu {0} Objekte"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "Bitte wählen Sie einen Schlüssel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "Bitte wählen Sie einen Wert"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 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/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "Eigenschaften/Mitgliedschaften"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "Eigenschaften der ausgewählten Objekte."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "Element von"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "Eigenschaften hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4669,39 +4699,39 @@
 msgstr "Hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 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/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "Eigenschaften bearbeiten"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 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/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Eigenschaften: {0} / Mitgliedschaften: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "Eigenschaften / Mitgliedschaften"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "Relation ändern"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Auswahl wirklich aus Relation {0} entfernen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 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/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "Eigenschaften entfernen"
@@ -4713,5 +4743,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "Relationen"
@@ -4745,31 +4775,31 @@
 "öffnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "Aktuelle Auswahl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "Ein Fenster mit der aktuellen Auswahl öffnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "Auf ausgewählte Elemente zoomen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "Die Auswahlliste aktualisieren."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "Auf Auswahl zoomen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Ausw.: Rel.:{0}/Wege:{1}/Knoten:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4777,5 +4807,5 @@
 msgstr "Auswahl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4784,5 +4814,5 @@
 msgstr[1] "{0} Wege"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4791,5 +4821,5 @@
 msgstr[1] "{0} Relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -4957,4 +4987,7 @@
 "''{0}''.</html>"
 msgstr ""
+"<html>Sie versuchen, eine Relation zu sich selbst hinzuzufügen.<br><br>Dies "
+"erzeugt zirkuläre Verweise und wird deswegen nicht empfohlen.<br>Überspringe "
+"Relation ''{0}''.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
@@ -5067,4 +5100,7 @@
 "conflict and close the editor?</html>"
 msgstr ""
+"<html>Diese Relation wurde außerhalb des Editors verändert.<br>Es ist nicht "
+"möglich, die Änderungen zu übernehmen und die Bearbeitung fortzusetzen."
+"<br><br>Soll ein Konflikt erstellt und der Editor geschlossen werden?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
@@ -5092,5 +5128,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5333,5 +5369,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "Orte"
@@ -5378,21 +5414,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "Typ"
@@ -6202,72 +6238,519 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "Name"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+"<html>Version <strong>{0}</strong> erzeugt am <strong>{1}</strong> von "
+"<strong>{2}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr "Version {0} erzeugt am {1} von {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr "Version"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr "Bilder für {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr "GPX lesen..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Keine Zeit für Punkt {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Zeit \"{0}\" vom Punkt {1} x {2} konnte nicht gelesen werden"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr "Keine Bilder mit lesbaren Zeitstempel gefunden."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "Einlesen {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr "Georeferenzierte Bilder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS Start: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS Ende: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr "Aktueller Unterschied: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr "Zeitzonen Unterschied: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "Bild"
+msgstr[1] "Bilder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} innerhalb der GPS-Spur."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "Uhrzeit synchronisieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG-Bilder (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Das Datum in der Datei \"{0}\" konnte nicht verarbeitet werden."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Keine EXIF-Zeitinformationen in der Datei \\\"{0}\\\" enthalten."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "Bild"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Angezeigtes Datum eingeben (mm/tt/jjjj HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr "Zeitzone des GPS-Geräts (Unterschied zum Foto)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr "Zeit mit GPS-Gerät synchronisieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr "Die eingegebene Zeit konnte nicht eingelesen werden."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr "GPS-Punkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "Linienaussehen anpassen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr "Globale Einstellungen verwenden."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr "Linien zwischen Punkten dieser Ebene zeichnen."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr "Keine Linien zwischen Punkten dieser Ebene zeichnen."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr "Linienaussehen wählen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "Farben anpassen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Voreinstellung"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Farbe auswählen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr "Marken von benannten Punkten"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Benannte GPS-Punkte von {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "Audio importieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr "Audio-Dateien im Wave-Format (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Audio-Marken von {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "Bilder importieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} GPS-Spur, "
+msgstr[1] "{0} GPS-Spuren, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} Route, "
+msgstr[1] "{0} Routen, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} Wegpunkt"
+msgstr[1] "{0} Wegpunkte"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr "Name: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr "Beschreibung: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr "Zeitspanne: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr "Länge: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "Zur Daten-Ebene konvertieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>Hochladen von unbearbeiteten GPS-Daten als Kartendaten ist unerwünscht!"
+"<br>Weitere Informationen, falls Sie die GPX-Spur hochladen möchten:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Konvertiert von: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr "OSM-Daten entlang der GPS-Spur herunterladen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr "Alles im Bereich herunterladen:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr "{0} Meter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr "Maximalgebiet je Anfrage:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km²"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Diese Aktion benötigt {0} individuelle Serveranfragen.<br>Wollen Sie "
+"fortfahren?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr ""
+"Keine GPS-Spur in der Ebene verfügbar, die mit den Audiodaten verbunden "
+"werden kann."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"Einige Wegpunkte mit Zeitstempeln vor Beginn oder nach dem Ende der GPS-Spur "
+"wurden ignoriert oder an den Anfang verschoben."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Einige Wegpunkte, welche für eine vernünftige Zeitabschätzung zu weit von "
+"der GPS-Spur entfernt waren, wurden ignoriert."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Datenebene {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr "Außerhalb des heruntergeladenen Bereichs"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr "Version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr "Warnung: Das Vermischen  von 0.6- und 0.5-Daten resultiert in Version 0.5"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} besteht aus:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} gelöscht.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr "nicht angegeben"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr "API-Version: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr "Zu GPX-Ebene konvertieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6276,7 +6759,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6286,452 +6769,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "Name"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-"<html>Version <strong>{0}</strong> erzeugt am <strong>{1}</strong> von "
-"<strong>{2}</strong></html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr "Version {0} erzeugt am {1} von {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr "Version"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr "Bilder für {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr "GPX lesen..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Keine Zeit für Punkt {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Zeit \"{0}\" vom Punkt {1} x {2} konnte nicht gelesen werden"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr "Keine Bilder mit lesbaren Zeitstempel gefunden."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Einlesen {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr "Georeferenzierte Bilder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS Start: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS Ende: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr "Aktueller Unterschied: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr "Zeitzonen Unterschied: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "Bild"
-msgstr[1] "Bilder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} innerhalb der GPS-Spur."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "Uhrzeit synchronisieren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG-Bilder (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Das Datum in der Datei \"{0}\" konnte nicht verarbeitet werden."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Keine EXIF-Zeitinformationen in der Datei \\\"{0}\\\" enthalten."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "Bild"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Angezeigtes Datum eingeben (mm/tt/jjjj HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr "Zeitzone des GPS-Geräts (Unterschied zum Foto)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr "Zeit mit GPS-Gerät synchronisieren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr "Die eingegebene Zeit konnte nicht eingelesen werden."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr "GPS-Punkt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "Linienaussehen anpassen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "Globale Einstellungen verwenden."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr "Linien zwischen Punkten dieser Ebene zeichnen."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr "Keine Linien zwischen Punkten dieser Ebene zeichnen."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr "Linienaussehen wählen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "Farben anpassen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Voreinstellung"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Farbe auswählen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr "Marken von benannten Punkten"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Benannte GPS-Punkte von {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "Audio importieren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr "Audio-Dateien im Wave-Format (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Audio-Marken von {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "Bilder importieren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} GPS-Spur, "
-msgstr[1] "{0} GPS-Spuren, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} Route, "
-msgstr[1] "{0} Routen, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} Wegpunkt"
-msgstr[1] "{0} Wegpunkte"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr "Name: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr "Beschreibung: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr "Zeitspanne: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr "Länge: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "Zur Daten-Ebene konvertieren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>Hochladen von unbearbeiteten GPS-Daten als Kartendaten ist unerwünscht!"
-"<br>Weitere Informationen, falls Sie die GPX-Spur hochladen möchten:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Konvertiert von: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr "OSM-Daten entlang der GPS-Spur herunterladen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr "Alles im Bereich herunterladen:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr "{0} Meter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr "Maximalgebiet je Anfrage:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km²"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Diese Aktion benötigt {0} individuelle Serveranfragen.<br>Wollen Sie "
-"fortfahren?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr ""
-"Keine GPS-Spur in der Ebene verfügbar, die mit den Audiodaten verbunden "
-"werden kann."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-"Einige Wegpunkte mit Zeitstempeln vor Beginn oder nach dem Ende der GPS-Spur "
-"wurden ignoriert oder an den Anfang verschoben."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Einige Wegpunkte, welche für eine vernünftige Zeitabschätzung zu weit von "
-"der GPS-Spur entfernt waren, wurden ignoriert."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Datenebene {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr "Außerhalb des heruntergeladenen Bereichs"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr "Version {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr "Warnung: Das Vermischen  von 0.6- und 0.5-Daten resultiert in Version 0.5"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} besteht aus:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} gelöscht.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr "nicht angegeben"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr "API-Version: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr "Zu GPX-Ebene konvertieren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -7124,5 +7160,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "Auto"
@@ -7139,16 +7175,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "Fahrrad"
@@ -7176,14 +7214,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "Zu Fuß"
@@ -7406,19 +7447,19 @@
 msgstr "Sprache"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr "Voreinstellungen laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr "integrierte Standardsymbole aktivieren"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr "MapPaint Stile"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr "Benutzter Stil"
@@ -7462,5 +7503,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115
 msgid "JOSM Plugin description URL"
-msgstr ""
+msgstr "URL der JOSM Plugin Beschreibung"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142
@@ -7547,39 +7588,11 @@
 msgstr "Proxyserver-Passwort"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Die Basis-URL des OSM Servers (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr "Benutzername (E-Mail) für den OSM-Server."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid "Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Passwort für den OSM-Server. Leer, wenn kein Passwort gespeichert werden "
-"soll."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "Server Basis-URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr "OSM-Benutzername (E-Mail)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "OSM-Passwort"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
-"<html>WARNUNG: Das Passwort wird im Klartext in der Einstellungsdatei "
-"gespeichert.<br>Das Passwort wird im Klartext (in der URL) zum Server "
-"übertragen.<br><b>Benutzen Sie kein wertvolles Passwort.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -8078,5 +8091,5 @@
 #, java-format
 msgid "Fetching {0} with id {1} from ''{2}''"
-msgstr ""
+msgstr "Hole {0} mit id {1} von ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:371
@@ -8088,5 +8101,5 @@
 #, java-format
 msgid "Fetching a package of {0} from ''{1}''"
-msgstr ""
+msgstr "Hole ein Paket{0} von ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408
@@ -8218,23 +8231,51 @@
 msgstr "Ungültige bz2-Datei."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "Passwort oder Benutzername falsch."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Achtung: Das Passwort wird unverschlüsselt übertragen."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "Benutzername und Passwort (unverschlüsselt) speichern"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "Passwort eingeben"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
 msgstr "Anmelden"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr "Benutzername (E-Mail) für den OSM-Server."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid "Login password to the OSM account. Leave blank to not store any password."
+msgstr ""
+"Passwort für den OSM-Server. Leer, wenn kein Passwort gespeichert werden "
+"soll."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr "OSM-Benutzername (E-Mail)"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "OSM-Passwort"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
+"<html>WARNUNG: Das Passwort wird im Klartext in der Einstellungsdatei "
+"gespeichert.<br>Das Passwort wird im Klartext (in der URL) zum Server "
+"übertragen.<br><b>Benutzen Sie kein wertvolles Passwort.</b></html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -8409,14 +8450,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid "Unknown relation member type {0}"
 msgstr "Unbekannter Relationselementtyp {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "OSM-Daten werden vorbereitet...."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr "Falsch formatierte Knoten-ID"
@@ -8476,4 +8517,6 @@
 "Exception was: {1}"
 msgstr ""
+"Das changeset {0} konnte nicht geschlossen werden. Es wird nach dem timeout "
+"durch den Server geschlossen. Die Fehlermeldung war: {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:172
@@ -8546,4 +8589,6 @@
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
+"Start des Plugins {0} wurde veranlasst. Dieses Plugin wird nicht mehr "
+"benötigt."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
@@ -8632,4 +8677,6 @@
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
+"Das Plugin konnte nicht entfernt werden. Möglicherweise ist es bereits "
+"deaktiviert."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
@@ -8881,5 +8928,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr "Beschreibung"
@@ -9299,5 +9346,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr "Fehler beim Laden der Datei"
@@ -9650,5 +9697,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -10195,7 +10242,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr "Wasser"
@@ -11094,5 +11141,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr "Straßenname"
@@ -11926,7 +11973,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr "Gebäude"
@@ -11940,5 +11987,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr "Fläche"
@@ -12215,9 +12262,9 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Start adjusting"
-msgstr ""
+msgstr "Justierung starten"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
 msgid "There are currently no WMS layer to adjust."
-msgstr ""
+msgstr "Es existieren momentan keine justierbaren WMS-Ebenen"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
@@ -12234,19 +12281,19 @@
 "nicht identisch. Das kann zu falschen Koordinaten führen."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr "Automatisches Laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS-Ebene ({0}): Automatisches Laden mit Zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS-Ebene ({0}): Laden mit Zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
@@ -12254,42 +12301,42 @@
 "die Auflösung"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr "Sichtbare Kacheln laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr "Auflösung ändern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr "Fehlerhafte Kacheln neu laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr "Alphakanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr "WMS-Ebene in Datei speichern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr "WMS-Ebene speichern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr "WMS-Ebene aus Datei laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr "WMS-Ebene laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "WMS-Datei-Version nicht unterstützt; gefunden {0}, erwartet {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr "Dateiformatfehler"
@@ -12667,4 +12714,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12701,5 +12750,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr "Straßen"
@@ -12710,5 +12759,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Autobahn"
@@ -12717,5 +12766,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr "Autobahn bearbeiten"
@@ -12742,8 +12791,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr "Referenz"
@@ -12784,21 +12833,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr "Ebene"
@@ -12812,8 +12861,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr "Spuren"
@@ -12831,15 +12880,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr "Höchstgeschwindigkeit (km/h)"
@@ -12876,16 +12925,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr "Einbahnstraße"
@@ -12927,19 +12976,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Brücke"
@@ -12975,19 +13024,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -13021,18 +13070,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr "Senke"
@@ -13066,18 +13115,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr "Straßendamm"
@@ -13085,5 +13134,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr "Autobahnanschluß"
@@ -13092,5 +13141,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr "Autobahnanschluß bearbeiten"
@@ -13098,5 +13147,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr "Schnellstraße"
@@ -13105,5 +13154,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr "Schnellstraße bearbeiten"
@@ -13113,6 +13162,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr "Kraftfahrstraße"
@@ -13120,5 +13169,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr "Schnellstraßenanschluß"
@@ -13127,5 +13176,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr "Schnellstraßenanschluß bearbeiten"
@@ -13138,5 +13187,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Bundesstraße"
@@ -13145,5 +13194,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr "Bundesstraße bearbeiten"
@@ -13151,10 +13200,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr "Bundesstraßenanschluß"
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr "Bundesstraßenanschluß bearbeiten"
@@ -13166,5 +13215,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Landesstraße"
@@ -13174,5 +13223,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr "Landesstraße bearbeiten"
@@ -13180,5 +13229,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr "Kreisstraße"
@@ -13188,5 +13237,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr "Kreisstraße bearbeiten"
@@ -13198,5 +13247,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Verbindungsstraße"
@@ -13206,5 +13255,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr "Verbindungsstraße bearbeiten"
@@ -13231,19 +13280,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr "Breite (Meter)"
@@ -13255,5 +13304,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Ortsstraße"
@@ -13262,5 +13311,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr "Ortsstraße bearbeiten"
@@ -13284,13 +13333,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr "Oberfläche"
@@ -13310,20 +13359,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr "befestigt"
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr "unbefestigt"
@@ -13331,12 +13380,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr "gepflastert"
@@ -13344,5 +13393,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr "Spielstraße"
@@ -13351,5 +13400,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr "Spielstraße bearbeiten"
@@ -13357,5 +13406,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr "Zufahrtsstraße"
@@ -13364,5 +13413,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr "Zufahrtsstraße bearbeiten"
@@ -13372,18 +13421,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr "Zufahrtsstraßentyp"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr "Gasse"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr "Auffahrt"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr "Parkplatzweg"
@@ -13391,5 +13440,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr "Parkplatzweg"
@@ -13399,5 +13448,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr "Parkplatzweg bearbeiten"
@@ -13405,5 +13454,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr "Unbekannter Straßentyp"
@@ -13412,5 +13461,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr "Straße mit unbekanntem Typ bearbeiten"
@@ -13419,20 +13468,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr "Straßeneinschränkungen"
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr "Straßeneinschränkungen bearbeiten"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr "Maut"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr "Kein Ausgang (Sackgasse)"
@@ -13445,8 +13494,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr "Zugang"
@@ -13490,23 +13539,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr "ja"
@@ -13519,40 +13568,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr "Privat"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr "Nutzungsart beschildert"
@@ -13565,19 +13614,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr "Anlieger"
@@ -13600,65 +13649,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr "privat gestattet"
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr "Agrar & Forst"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr "nein"
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr "Waren"
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Schwerlast (hgv)"
@@ -13673,10 +13722,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr "Pferd"
@@ -13692,13 +13741,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr "Motorrad"
@@ -13714,30 +13763,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr "Automobil"
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr "Öffentlicher Service (psv)"
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr "Motorboot"
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr "Boot"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr "Min. Geschwindigkeit (km/h)"
@@ -13745,25 +13794,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr "Max. Gewicht (Tonnen)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr "Max. Höhe (Meter)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr "Max. Breite (Meter)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr "Max. Länge (Meter)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr "Kreisverkehr"
@@ -13774,5 +13823,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr "Kreuzung bearbeiten"
@@ -13794,9 +13843,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr "Typ"
@@ -13816,10 +13865,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr "Autobahn"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr "Autobahnanschluß"
@@ -13841,10 +13890,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr "Schnellstraße"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr "Schnellstraßenanschluß"
@@ -13866,10 +13915,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr "Bundesstraße"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr "Bundesstraßenanschluß"
@@ -13891,6 +13940,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr "Landesstraße"
@@ -13904,9 +13953,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr "Kreisstraße"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr "Verbindungsstraße"
@@ -13920,9 +13969,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr "Ortsstraße"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr "Spielstraße"
@@ -13952,10 +14001,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr "Service"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr "Spurbus"
@@ -13963,4 +14012,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13978,6 +14034,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr "Baustelle"
@@ -13988,10 +14044,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr "Brücke bearbeiten"
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr "Tunnel bearbeiten"
@@ -13999,19 +14055,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr "Wege"
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr "Baustelle"
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr "Eine im Bau befindliche Straße bearbeiten"
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr "Kreuzung"
@@ -14027,5 +14083,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr "Kreisverkehr"
@@ -14034,5 +14090,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr "Reitweg"
@@ -14040,5 +14096,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr "Reitweg bearbeiten"
@@ -14046,5 +14102,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr "Fahrradweg"
@@ -14054,5 +14110,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr "Fahrradweg bearbeiten"
@@ -14060,5 +14116,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr "Fußweg"
@@ -14067,5 +14123,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr "Fußweg bearbeiten"
@@ -14073,5 +14129,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr "Fußgängerzone"
@@ -14080,5 +14136,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr "Fußgängerzone bearbeiten"
@@ -14086,5 +14142,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr "Treppe"
@@ -14094,5 +14150,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr "Treppe bearbeiten"
@@ -14101,5 +14157,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr "Feld- oder Waldweg"
@@ -14108,14 +14164,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr "Feld- oder Waldweg bearbeiten"
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr "Beton"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr "Schotter"
@@ -14123,18 +14179,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr "Erde"
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr "Gras"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr "Sand"
@@ -14142,5 +14198,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr "Feldweg Grad 1 (asphaltiert)"
@@ -14149,5 +14205,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr "Feld- oder Waldweg Grad 1 (asphaltiert) bearbeiten"
@@ -14155,5 +14211,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr "Feldweg Grad 2 (Schotter)"
@@ -14162,5 +14218,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr "Feld- oder Waldweg Grad 2 (Schotter) bearbeiten"
@@ -14168,5 +14224,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr "Feldweg Grad 3 (befestigt)"
@@ -14175,5 +14231,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr "Feld- oder Waldweg Grad 3 (befestigt) bearbeiten"
@@ -14181,5 +14237,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr "Feldweg Grad 4 (wenig befestigt)"
@@ -14188,5 +14244,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr "Feld- oder Waldweg Grad 4 (wenig befestigt) bearbeiten"
@@ -14194,5 +14250,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr "Feldweg Grad 5 (unbefestigt)"
@@ -14201,5 +14257,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr "Feld- oder Waldweg Grad 5 (unbefestigt) bearbeiten"
@@ -14208,5 +14264,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr "Pfad"
@@ -14215,13 +14271,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr "Pfad bearbeiten"
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr "Schneemobil"
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr "Ski"
@@ -14229,5 +14285,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr "Wanderweg"
@@ -14237,5 +14293,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr "Wanderweg bearbeiten"
@@ -14243,5 +14299,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr "Bergwanderweg"
@@ -14251,5 +14307,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr "Bergwanderweg bearbeiten"
@@ -14257,5 +14313,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr "Anspruchsvoller Bergwanderweg"
@@ -14265,5 +14321,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Anspruchsvollen Bergwanderweg bearbeiten"
@@ -14271,5 +14327,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr "Alpiner Wanderweg"
@@ -14279,5 +14335,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr "Alpinen Wanderweg bearbeiten"
@@ -14285,5 +14341,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr "Anspruchsvoller alpiner Wanderweg"
@@ -14293,5 +14349,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Anspruchsvollen alpinen Wanderweg bearbeiten"
@@ -14299,5 +14355,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr "Schwerer alpiner Wanderweg"
@@ -14307,5 +14363,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Schweren alpinen Wanderweg bearbeiten"
@@ -14313,10 +14369,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr "Wegpunkte"
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr "Autobahnkreuz"
@@ -14324,15 +14380,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr "Autobahnkreuz bearbeiten"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr "Rastplatz / Autohof"
@@ -14340,5 +14396,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr "Rastplatz / Autohof bearbeiten"
@@ -14373,14 +14429,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr "Betreiber"
@@ -14389,5 +14445,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr "Ampel"
@@ -14397,5 +14453,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr "Typ des Fußgängerüberwegs"
@@ -14404,27 +14460,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr "unkontrolliert"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr "Ampel"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr "Insel"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr "unmarkiert"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr "Zu Pferd"
@@ -14432,6 +14488,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr "Mit Fahrrad"
@@ -14440,11 +14496,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr "Begleitperson"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr "Übergangstyp (UK)"
@@ -14452,30 +14508,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr "Zebrastreifen"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr "Ampel (Pelikan)"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr "Fußgängerampel (Toukan)"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr "Fußgängerampel (Puffin)"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr "Ampel für Füßgänger, Fahrrad, Pferd (Pegasus)"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr "Zebrastreifen (Tiger)"
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr "Stopp-Schild"
@@ -14483,5 +14539,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr "Fußgängerüberweg"
@@ -14490,14 +14546,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr "Fußgängerüberweg bearbeiten"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr "Typname (UK)"
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr "Kleiner Kreisverkehr"
@@ -14508,14 +14564,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr "Richtung"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr "Im Uhrzeigersinn"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr "Wendestelle"
@@ -14525,20 +14581,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr "Ortseingangsschild"
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr "Ortseingangsschild bearbeiten"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr "Zweiter Name"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr "Geschwindigkeitsüberwachung"
@@ -14546,5 +14602,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr "Notfalltelefon"
@@ -14552,5 +14608,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr "Steigung"
@@ -14558,5 +14614,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr "Starke Steigung"
@@ -14565,10 +14621,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr "Furt"
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr "Furt bearbeiten"
@@ -14576,5 +14632,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr "Gebirgspass"
@@ -14582,5 +14638,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr "Gebirgspass bearbeiten"
@@ -14592,7 +14648,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr "Höhe"
@@ -14600,5 +14656,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr "Barrieren"
@@ -14606,5 +14662,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr "Poller"
@@ -14612,5 +14668,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr "Poller bearbeiten"
@@ -14649,18 +14705,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr "Erlaubter Verkehr:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr "Umlaufgitter"
@@ -14669,5 +14729,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr "Steinblock"
@@ -14675,5 +14735,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr "Viehgitter"
@@ -14681,10 +14741,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr "Viehgitter bearbeiten"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr "Busschleuse"
@@ -14692,15 +14752,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr "Spikes / Dornen"
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr "Spikes / Dornen bearbeiten"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr "Mautstation"
@@ -14708,5 +14768,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr "Mautstation bearbeiten"
@@ -14714,10 +14774,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr "Grenzkontolle"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr "Grenzkontrolle bearbeiten"
@@ -14727,5 +14787,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr "Hecke"
@@ -14734,5 +14794,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr "Zaun"
@@ -14741,5 +14801,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr "Mauer"
@@ -14747,5 +14807,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr "Stadtmauer"
@@ -14754,5 +14814,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr "Stützmauer"
@@ -14764,15 +14824,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr "Eingang"
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr "Eingang bearbeiten"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr "Gatter / Tor"
@@ -14780,50 +14840,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr "Gatter / Tor bearbeiten"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr "Schlagbaum"
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr "Schlagbaum bearbeiten"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr "Drahtgatter"
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr "Drahtgatter bearbeiten"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr "Fahrzeuggatter"
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr "Fahrzeuggatter bearbeiten"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr "Personengatter"
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr "Personengatter bearbeiten"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr "Zauntreppe"
@@ -14831,15 +14891,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr "Zauntreppe bearbeiten"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+msgid "Turnstile"
+msgstr "Drehsperre"
+
+#. item
+#: build/trans_presets.java:1018
+msgid "Edit Turnstile"
+msgstr "Drehsperre bearbeiten"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr "Durchgangsschleuse"
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr "Durchgangsschleuse bearbeiten"
@@ -14850,10 +14920,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr "Wasser"
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr "Quelle"
@@ -14861,5 +14931,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr "Quelle bearbeiten"
@@ -14867,5 +14937,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr "Abwassergraben"
@@ -14873,10 +14943,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr "Abwassergraben bearbeiten"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr "Bach"
@@ -14884,10 +14954,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr "Bach bearbeiten"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr "Kanal"
@@ -14895,10 +14965,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr "Kanal bearbeiten"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr "Fluß"
@@ -14908,5 +14978,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr "Fluss bearbeiten"
@@ -14914,15 +14984,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr "Wasserfläche bearbeiten"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr "Landfläche bearbeiten"
@@ -14930,15 +15000,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr "Wasserbecken"
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr "Wasserbecken bearbeiten"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr "Speicherbecken"
@@ -14946,15 +15016,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr "Speicherbecken bearbeiten"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr "Überdecktes Speicherbassin"
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr "Überdecktes Speicherbassin bearbeiten"
@@ -14962,5 +15032,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr "Flußbett"
@@ -14969,10 +15039,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr "Flußbett bearbeiten"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr "Feuchtgebiet"
@@ -14983,14 +15053,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr "Feuchtgebiet bearbeiten"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr "Sumpf"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr "Moor"
@@ -15004,35 +15074,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr "Marsch"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr "Röhricht"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr "Salzwiese"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr "Watt"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr "Mangroven"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr "Schlick & Moor"
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr "Schlickiges Gebiet bearbeiten"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr "Strand"
@@ -15040,20 +15110,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr "Strand bearbeiten"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr "Meeresbucht"
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr "Meeresbucht bearbeiten"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr "Klippe"
@@ -15061,10 +15131,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr "Klippe bearbeiten"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr "Küstenlinie"
@@ -15072,5 +15142,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr "Küstenlinie bearbeiten"
@@ -15078,5 +15148,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr "Fährroute"
@@ -15084,5 +15154,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr "Fährroute bearbeiten"
@@ -15091,5 +15161,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr "Bootswerft"
@@ -15097,10 +15167,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr "Bootswerft bearbeiten"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr "Dock"
@@ -15108,5 +15178,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr "Dock bearbeiten"
@@ -15114,5 +15184,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr "Damm"
@@ -15120,15 +15190,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr "Damm bearbeiten"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr "Gewässerpunkte"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr "Schleusentor"
@@ -15137,5 +15207,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr "Wehr"
@@ -15143,20 +15213,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr "Wehr bearbeiten"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr "Wasserfall"
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr "Wasserfall bearbeiten"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr "Wendepunkt"
@@ -15165,15 +15235,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr "Jachthafen"
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr "Jachthafen bearbeiten"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr "Anlegestelle (Pier)"
@@ -15181,10 +15251,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr "Anlegestelle (Pier) bearbeiten"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr "Fährstelle"
@@ -15192,10 +15262,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr "Fährstelle bearbeiten"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr "Bootshebeanlage"
@@ -15205,5 +15275,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr "Bootshebeanlage bearbeiten"
@@ -15211,10 +15281,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr "Eisenbahn"
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr "Eisenbahn"
@@ -15222,5 +15292,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr "Eisenbahn bearbeiten"
@@ -15250,8 +15320,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr "Optionale Typen"
@@ -15265,35 +15335,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr "Rangiergleis"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr "Abstellgleis"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr "Firmenanschlußgleis"
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr "Schmalspurbahn"
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr "Schmalspurbahn bearbeiten"
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr "Einschienenbahn"
@@ -15301,45 +15371,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr "Einschienenbahn bearbeiten"
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr "Museumsbahn"
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr "Museumsbahn bearbeiten"
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr "S-Bahn"
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr "S-Bahn bearbeiten"
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr "U-Bahn"
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr "U-Bahn bearbeiten"
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr "Straßenbahn"
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr "Straßenbahn bearbeiten"
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr "Spurbus"
@@ -15347,5 +15417,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr "Spurbusstrecke bearbeiten"
@@ -15354,14 +15424,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr "Stillgelegte Strecke"
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr "Stillgelegte Strecke bearbeiten"
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr "Strecke abgebaut"
@@ -15370,5 +15440,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr "Bahnübergang"
@@ -15377,5 +15447,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr "(Fuß-)Übergang"
@@ -15385,5 +15455,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr "Type des Übergangs"
@@ -15391,5 +15461,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr "Drehscheibe"
@@ -15398,10 +15468,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr "Seilbahnen"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr "Sessellift"
@@ -15409,10 +15479,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr "Sessellift bearbeiten"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr "Schlepplift"
@@ -15420,10 +15490,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr "Schlepplift bearbeiten"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr "Seilbahn"
@@ -15431,10 +15501,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr "Seilbahn bearbeiten"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr "Gondelbahn"
@@ -15442,5 +15512,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr "Gondelbahn bearbeiten"
@@ -15448,5 +15518,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr "Station"
@@ -15457,10 +15527,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr "Bahnhof bearbeiten"
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr "Tankstelle"
@@ -15470,5 +15540,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr "Tankstelle bearbeiten"
@@ -15484,5 +15554,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15492,5 +15562,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr "Parken bearbeiten"
@@ -15498,41 +15568,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr "Kapazität"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr "ebenerdig"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr "Parkhaus"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr "Tiefgarage"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr "Park&Ride"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr "Behindertenparkplätze"
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr "Gebühr"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr "Autowäsche"
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr "Autowäsche bearbeiten"
@@ -15540,5 +15610,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr "Geschäft"
@@ -15546,15 +15616,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr "Autohaus bearbeiten"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr "Werkstatt"
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr "Autowerkstatt bearbeiten"
@@ -15562,5 +15632,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr "Vermietung"
@@ -15569,10 +15639,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr "Autovermietung bearbeiten"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr "Autotausch / Car Sharing"
@@ -15580,5 +15650,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr "Autotausch (Car Sharing) bearbeiten"
@@ -15586,5 +15656,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr "Fahrradparkplatz bearbeiten"
@@ -15593,5 +15663,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr "Fahrradleihstelle bearbeiten"
@@ -15600,15 +15670,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr "Fahrradladen bearbeiten"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "Öffentliche Verkehrsmittel"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr "UIC-Referenz"
@@ -15616,5 +15686,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr "Eisenbahnhaltepunkt"
@@ -15622,5 +15692,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr "Haltepunkt bearbeiten"
@@ -15628,5 +15698,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr "Straßenbahnhaltestelle"
@@ -15635,5 +15705,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr "Straßenbahnhaltestelle bearbeiten"
@@ -15641,5 +15711,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr "Bahnsteig"
@@ -15648,5 +15718,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr "Bahnsteig bearbeiten"
@@ -15658,5 +15728,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr "Referenznummer (Steig)"
@@ -15664,10 +15734,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr "Fläche"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr "U-Bahn-Eingang"
@@ -15676,10 +15746,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr "U-Bahn-Eingang bearbeiten"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr "Rollstuhl"
@@ -15688,5 +15758,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr "Busbahnhof"
@@ -15695,5 +15765,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr "Busbahnhof bearbeiten"
@@ -15701,5 +15771,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr "Bushaltestelle"
@@ -15709,5 +15779,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr "Bushaltestelle bearbeiten"
@@ -15718,6 +15788,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr "Schutzraum"
@@ -15725,10 +15795,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr "Bussteig"
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr "Bussteig bearbeiten"
@@ -15736,5 +15806,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr "Taxi"
@@ -15742,5 +15812,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr "Taxihaltepunkt bearbeiten"
@@ -15748,5 +15818,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr "Flughafen"
@@ -15754,15 +15824,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr "Flughafen bearbeiten"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr "ICAO"
@@ -15771,5 +15841,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr "Unterkunft"
@@ -15781,5 +15851,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -15788,15 +15858,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr "Hotel bearbeiten"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr "Sterne"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr "Motel"
@@ -15804,20 +15874,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr "Motel bearbeiten"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr "Gästehaus (Bed & Breakfast)"
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr "Gästehaus bearbeiten"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr "Ferienhaus"
@@ -15825,10 +15895,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr "Ferienhaus bearbeiten"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr "Jugendherberge"
@@ -15836,30 +15906,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr "Jugendherberge bearbeiten"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr "Alpenhütte"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr "Alpenhütte bearbeiten"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr "Wohnwagenstellplätze"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr "Wohnwagenstellplätze bearbeiten"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr "Campingplatz"
@@ -15867,10 +15937,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr "Campingplatz bearbeiten"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "Essen & Trinken"
@@ -15881,5 +15951,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -15887,5 +15957,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr "Restaurant bearbeiten"
@@ -15893,5 +15963,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr "Küche"
@@ -15899,61 +15969,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr "italienisch"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr "chinesisch"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr "Pizza"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr "Hamburger"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr "griechisch"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr "deutsch"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr "indisch"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr "Döner"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr "türkisch"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr "asiatisch"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr "thailändisch"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr "mexikanisch"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr "japanisch"
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr "Imbiss (Fast Food)"
@@ -15961,9 +16031,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr "Imbiss (Fast Food-Restaurant) bearbeiten"
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr "Café"
@@ -15971,10 +16041,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr "Café bearbeiten"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr "Kneipe"
@@ -15982,20 +16052,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr "Kneipe bearbeiten"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr "Biergarten bearbeiten"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr "Bar"
@@ -16003,10 +16073,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr "Bar bearbeiten"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr "Nachtclub"
@@ -16014,20 +16084,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr "Nachtclub bearbeiten"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "Tourismus"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr "Attraktion"
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr "Attraktion bearbeiten"
@@ -16036,11 +16106,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr "Öffnungszeiten"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "Museum"
@@ -16048,10 +16118,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr "Museum bearbeiten"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "Zoo"
@@ -16060,10 +16130,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr "Zoo bearbeiten"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr "Aussichtspunkt"
@@ -16071,25 +16141,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr "Aussichtspunkt bearbeiten"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr "Aussichtsturm"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr "Themenpark"
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr "Themenpark bearbeiten"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr "Kunstausstellung"
@@ -16097,5 +16167,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr "Kunstausstellung bearbeiten"
@@ -16103,5 +16173,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr "Informationsbüro"
@@ -16109,80 +16179,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr "Informationsbüro bearbeiten"
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "Karte"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr "Kartentyp"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr "Karte"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr "Stadtplan"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr "Wanderkarte"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr "Fahrradkarte"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
 msgid "Closer Description"
 msgstr "Nähere Beschreibung"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1701
 msgid "Information Board"
 msgstr "Informationstafel"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Board Type"
 msgstr "Tafeltyp"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "board"
 msgstr "Infotafel"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "history"
 msgstr "Geschichte"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "nature"
 msgstr "Natur"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "wildlife"
 msgstr "Wildtiere"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Guidepost (Hiking)"
 msgstr "Wegweiser (Wandern)"
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr "Andere Informationspunkte"
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr "Schutzraum bearbeiten"
@@ -16190,25 +16260,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr "Feuerstelle"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr "Picknickplatz"
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr "Picknickplatz bearbeiten"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "Historische Stätten"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "Burg / Schloß"
@@ -16217,20 +16287,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr "Burg / Schloß bearbeiten"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "Ruinen"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr "Ruinen bearbeiten"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr "Ausgrabungsstelle"
@@ -16239,10 +16309,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr "Ausgrabungsstelle bearbeiten"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr "Schlachtfeld"
@@ -16250,5 +16320,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr "Schlachtfeld bearbeiten"
@@ -16256,15 +16326,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr "Baudenkmal"
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr "Baudenkmal bearbeiten"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr "Gedenkstätte"
@@ -16272,45 +16342,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr "Gedenkstätte bearbeiten"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr "Wegkreuz"
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr "Wegkreuz bearbeiten"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr "Bildstock"
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr "Bildstock bearbeiten"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "Freizeit"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr "Schwimmbad"
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr "Schwimmbad bearbeiten"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "Spielplatz"
@@ -16318,15 +16388,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr "Spielplatz bearbeiten"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "Angeln"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr "Angelplatz bearbeiten"
@@ -16334,15 +16404,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr "Sporteinrichtungen"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr "Stadion bearbeiten"
@@ -16356,6 +16426,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "Sportart wählen:"
@@ -16378,4 +16448,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -16436,5 +16514,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16444,5 +16530,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16588,5 +16674,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16692,5 +16778,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16731,29 +16817,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr "Sport"
@@ -16763,227 +16850,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr "Mehrfachnutzung"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr "Bogenschießen"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr "Leichtathletik"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr "Australian Football"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr "Baseball"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr "Basketball"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr "Boule"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr "Bowls"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr "Kanu"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr "Klettern"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr "Kricket"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr "Kricketnetze"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr "Krocket"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr "Fahrradfahren"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr "Hunderennen"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr "Reiten"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr "American Football"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr "Golf"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr "Gymnastik"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr "Hockey"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr "Pferderennen"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr "Motorsport"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr "Pelota"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr "Schlagball (Racquet)"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr "Rugby"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr "Schießen"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr "Skateboard"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr "Eislaufen"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr "Skifahren"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "Fußball"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr "Schwimmen"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "Tischtennis"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr "Tennis"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr "Sporthalle / Fitnesscenter"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr "Sporthalle / Fitnesscenter bearbeiten"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr "Spielfeld"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr "Spielfeld bearbeiten"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr "Rennbahn"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr "Rennbahn bearbeiten"
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr "Golfanlage"
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr "Golfanlage bearbeiten"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr "Minigolfplatz bearbeiten"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr "Mehrfachnutzung"
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr "Mehrfach genutzten Sportplatz bearbeiten"
@@ -17022,191 +17109,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr "Spielfeld"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr "Sporthalle / Fitnesscenter"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr "Stadion"
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr "Bowlinghalle bearbeiten"
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr "Leichtathletik"
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr "Leichtathletikfeld bearbeiten"
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr "Bogenschießen"
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr "Bogenschießplatz bearbeiten"
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr "Klettern"
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr "Kletterbereich bearbeiten"
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr "Kanufahren"
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr "Kanufahrtstrecke bearbeiten"
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr "Radfahren"
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr "Radsporthalle oder -kurs bearbeiten"
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr "Hunderennen"
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr "Trainingsplatz für Hunde bearbeiten"
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr "Reitplatz"
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr "Reitplatz bearbeiten"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr "Pferderennen"
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr "Pferderennplatz bearbeiten"
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr "Gymnastikbereich bearbeiten"
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr "Motorsportplatz bearbeiten"
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr "Eislaufen"
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr "Eislaufbahn bearbeiten"
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr "Skateboardplatz bearbeiten"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr "Schwimmen"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr "Schwimmbad bearbeiten"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr "Skifahren"
@@ -17214,56 +17301,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr "Skipiste bearbeiten"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr "Pistentyp"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr "Abfahrt"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr "Langlauf"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr "Schneepark"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr "Schwierigkeit"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr "Anfänger"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr "einfach"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr "mittelschwer"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr "fortgeschritten"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr "Experte"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr "Freistil"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr "Schießen"
@@ -17271,178 +17358,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr "Schießbahn bearbeiten"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr "Ballsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr "Fußball"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr "Fußballplatz bearbeiten"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr "American Football"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr "American Football-Platz bearbeiten"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr "Australian Foootball-Platz bearbeiten"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr "Baseballplatz bearbeiten"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr "Basketballplatz bearbeiten"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr "Golfplatz"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr "Golfplatz bearbeiten"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr "Golfanlage"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr "Boule-Spielbereich bearbeiten"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr "Bowls-Spielfeld bearbeiten"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr "Kricket"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr "Kricketspielfeld bearbeiten"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr "Kricketnetze"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr "Kricketnetze bearbeiten"
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr "Krocketspielfeld bearbeiten"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr "Hockeyplatz bearbeiten"
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr "Pelotaplatz bearbeiten"
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr "Schlagball (Racquet)"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr "Schlagball (Racquet)-Platz bearbeiten"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr "Rugbyplatz bearbeiten"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr "Tischtennis"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr "Tischtennisplatz bearbeiten"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr "Tennisplatz bearbeiten"
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "Gebäude"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr "Gebäude"
@@ -17450,5 +17537,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "Öffentliches Gebäude"
@@ -17456,10 +17543,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr "Öffentliches Gebäuden bearbeiten"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "Rathaus"
@@ -17467,10 +17554,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "Rathaus bearbeiten"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "Botschaft"
@@ -17478,10 +17565,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "Botschaft bearbeiten"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "Gericht"
@@ -17490,10 +17577,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "Gericht bearbeiten"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "Gefängnis"
@@ -17502,10 +17589,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "Gefängnis bearbeiten"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "Polizei"
@@ -17515,10 +17602,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "Polizei bearbeiten"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "Feuerwache"
@@ -17527,10 +17614,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "Feuerwache bearbeiten"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "Post"
@@ -17538,5 +17625,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr "Post bearbeiten"
@@ -17544,15 +17631,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr "Kindergarten"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr "Kindergarten bearbeiten"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "Schule"
@@ -17560,10 +17647,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "Schule bearbeiten"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr "Universität"
@@ -17571,10 +17658,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr "Universität bearbeiten"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr "Hochschule"
@@ -17582,5 +17669,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr "College bearbeiten"
@@ -17588,5 +17675,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "Kino"
@@ -17595,10 +17682,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "Kino bearbeiten"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "Bibliothek"
@@ -17607,10 +17694,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "Bibliothek bearbeiten"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr "Kulturzentrum"
@@ -17618,10 +17705,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr "Kulturzentrum bearbeiten"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "Theater"
@@ -17630,10 +17717,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "Theater bearbeiten"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr "Kirche"
@@ -17643,5 +17730,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr "Kirche bearbeiten"
@@ -17650,6 +17737,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr "Religion"
@@ -17658,66 +17745,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr "bahaiistisch"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr "buddhistisch"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr "christlich"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr "hinduistisch"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr "jainistisch"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr "jüdisch"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr "moslemisch"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr "sikhistisch"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr "spiritistisch"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr "taoistisch"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr "unitarisch"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr "zoroastrisch"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr "Konfession"
@@ -17726,81 +17813,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr "anglikanisch"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr "baptistisch"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr "katholisch"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr "evangelikal"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr "Zeugen Jehovas"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr "lutherisch"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr "methodistisch"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr "mormonisch"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr "Pfingstgemeinde"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr "presbyterianisch"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr "protestantisch"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr "Quäker"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr "schiitisch"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr "sunnitisch"
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr "Adressen"
@@ -17809,5 +17896,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr "Adressinformationen bearbeiten"
@@ -17815,5 +17902,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr "Hausnummer"
@@ -17821,20 +17908,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr "Hausname"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr "Ortsname"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "Postleitzahl"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr "Länderkennung"
@@ -17842,5 +17929,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr "Adressinterpolation"
@@ -17849,5 +17936,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr "Adressinterpolation bearbeiten"
@@ -17855,71 +17942,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr "Nummernschema"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr "ungerade"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr "gerade"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr "alle"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr "alphabetisch"
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr "Zivilisationsbauten"
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr "Fabrik"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr "Fabrik bearbeiten"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "Turm"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "Turm bearbeiten"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "Wasserturm"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "Wasserturm bearbeiten"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr "Gasometer bearbeiten"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "Leuchtturm"
@@ -17927,10 +18014,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "Leuchtturm bearbeiten"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "Windmühle"
@@ -17938,10 +18025,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "Windmühle bearbeiten"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -17949,10 +18036,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "Pipeline bearbeiten"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr "Kläranlage"
@@ -17962,10 +18049,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr "Kläranlage bearbeiten"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr "Stationärer Kran"
@@ -17973,10 +18060,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr "Stationären Kran bearbeiten"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr "Bake"
@@ -17984,10 +18071,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr "Bake bearbeiten"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr "Vermessungspunkt"
@@ -17995,10 +18082,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr "Vermessungspunkt bearbeiten"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr "Überwachungskamera"
@@ -18006,5 +18093,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr "Überwachungskamera bearbeiten"
@@ -18012,5 +18099,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr "Stromgenerator"
@@ -18020,39 +18107,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr "Stromgenerator bearbeiten"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr "Wind"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr "Wasser"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr "Fossil"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr "Nuklear"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr "Kohle"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr "Photovoltaik"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr "Gas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr "Umspannwerk"
@@ -18061,10 +18148,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr "Umspannwerk bearbeiten"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr "Trafostation"
@@ -18073,5 +18160,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr "Trafostation bearbeiten"
@@ -18079,10 +18166,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr "Liniennummer"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr "Strommast"
@@ -18093,5 +18180,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr "Strommast bearbeiten"
@@ -18099,5 +18186,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr "Stromleitung"
@@ -18106,25 +18193,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr "Stromleitung bearbeiten"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr "Spannung"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr "Leitungsanzahl"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr "Einrichtungen"
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "Toiletten"
@@ -18132,20 +18219,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr "Referenznummer"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr "Kommentar"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr "Briefkasten"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "Telefon"
@@ -18154,5 +18241,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr "Telefon bearbeiten"
@@ -18160,5 +18247,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "Münzen"
@@ -18166,5 +18253,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr "Scheine"
@@ -18172,5 +18259,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr "Geld- oder Prepaidkarten"
@@ -18178,5 +18265,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr "Konto- oder EC-Karten"
@@ -18184,15 +18271,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "Kreditkarten"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "Telefonkarten"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr "Recyclingstelle & -container"
@@ -18201,5 +18288,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr "Recyclingstelle oder -container bearbeiten"
@@ -18207,35 +18294,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr "Batterien"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr "Dosen"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr "Kleidung"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr "Altmetall"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr "Bank"
@@ -18244,20 +18331,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr "Jagdanstand"
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr "Jagdanstand bearbeiten"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr "Versteck"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr "Schloß"
@@ -18265,22 +18352,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr "Höhe"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr "niedrig"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr "halb"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr "voll"
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr "Springbrunnen"
@@ -18289,10 +18376,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr "Springbrunnen bearbeiten"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "Trinkwasser"
@@ -18301,10 +18388,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "Trinkwasserabgabe bearbeiten"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr "Babyklappe"
@@ -18312,25 +18399,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr "Babyklappe bearbeiten"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "Geschäfte"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr "Supermarkt"
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr "Supermarkt bearbeiten"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr "Tante-Emma-Laden"
@@ -18338,10 +18425,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr "Tante-Emma-Laden bearbeiten"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -18349,10 +18436,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr "Kiosk bearbeiten"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "Verkaufsautomat"
@@ -18360,5 +18447,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "Automaten bearbeiten"
@@ -18366,88 +18453,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "Automatenprodukte"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr "Fahrscheine"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr "Pläne des öffentlichen Nahverkehrs"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr "Parkscheine"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr "Essen"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "Getränke"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr "Süßigkeiten"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr "Zigaretten"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr "Fotos"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr "Tiernahrung"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "Zeitungen"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "Spielzeug"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr "Briefmarken"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "SIM-Karten"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr "Telefonkarten"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr "Karten/Belege"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr "Kondome"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr "Tampons"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr "Hundekot-Tüten"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr "Kundenkarten"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "Fleischer"
@@ -18455,10 +18542,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "Fleischer bearbeiten"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "Bäcker"
@@ -18466,10 +18553,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "Bäcker bearbeiten"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr "Blumenladen"
@@ -18477,20 +18564,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr "Blumenladen bearbeiten"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr "Bioladen"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr "Bioladen bearbeiten"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr "Spirituosen"
@@ -18498,60 +18585,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr "Spirituosengeschäft bearbeiten"
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr "Getränke"
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr "Getränkeladen bearbeiten"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr "Computer"
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr "Computergeschäft bearbeiten"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr "Elektronikgeschäft"
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr "Elektronikgeschäft bearbeiten"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr "Hifi-Geschäft bearbeiten"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr "Mobiliar"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr "Möbelgeschäft bearbeiten"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr "Gartenzentrum"
@@ -18559,10 +18646,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr "Gartenzentrum bearbeiten"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr "Haushaltswaren"
@@ -18570,10 +18657,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr "Haushaltswaren bearbeiten"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr "Heimwerkerbedarf"
@@ -18581,60 +18668,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr "Geschäft für Heimwerkerbedarf bearbeiten"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr "Bürobedarf"
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr "Bürobedarf bearbeiten"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr "Friseur"
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr "Friseur bearbeiten"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr "Schuhe"
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr "Schuhladen bearbeiten"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr "Spielzeug"
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr "Spielzeuggeschäft bearbeiten"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr "Videoverleih"
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr "Videogeschäft bearbeiten"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "Chemische Reinigung"
@@ -18642,10 +18729,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "Chemische Reinigung bearbeiten"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "Waschsalon"
@@ -18653,10 +18740,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "Waschsalon bearbeiten"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr "Camping (Outdoor)"
@@ -18664,35 +18751,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr "Laden für Camping- (Outdoor-)bedarf bearbeiten"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr "Sport"
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr "Sportgeschäft bearbeiten"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr "Optiker"
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr "Optiker bearbeiten"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "Geld"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "Bank"
@@ -18700,5 +18787,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "Bank bearbeiten"
@@ -18706,10 +18793,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "Geldautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr "Wechselstube"
@@ -18717,5 +18804,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr "Wechselstube bearbeiten"
@@ -18723,15 +18810,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "Geldautomat bearbeiten"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "Gesundheit"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr "Arzt"
@@ -18739,20 +18826,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr "Arzt bearbeiten"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr "Zahnarzt"
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr "Zahnarzt bearbeiten"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "Apotheke"
@@ -18760,5 +18847,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "Apotheke bearbeiten"
@@ -18766,10 +18853,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr "Rezepteinlösung"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "Krankenhaus"
@@ -18777,10 +18864,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "Krankenhaus bearbeiten"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr "Notfallrettungspunkt"
@@ -18789,5 +18876,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr "Notfallrettungspunkt bearbeiten"
@@ -18796,20 +18883,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr "Punktnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr "Punktname"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Internationale Nummer verwenden, z.B. +49-123-45678)"
@@ -18817,5 +18904,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr "Tierarzt"
@@ -18824,56 +18911,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr "Tierarzt bearbeiten"
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr "Kontinent bearbeiten"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr "Staat"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr "Staat bearbeiten"
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr "Bundesland"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr "Bundesland bearbeiten"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr "Region"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr "Region bearbeiten"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr "Landkreis"
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr "Landkreis bearbeiten"
@@ -18881,15 +18967,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr "Großstadt"
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr "Großstadt bearbeiten"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr "Stadt"
@@ -18897,10 +18983,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr "Stadt bearbeiten"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr "Stadtteil"
@@ -18908,25 +18994,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr "Stadtteil bearbeiten"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "Dorf"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "Dorf bearbeiten"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr "Weiler"
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr "Weiler bearbeiten"
@@ -18934,5 +19020,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr "Unbewohnter Ort"
@@ -18940,10 +19026,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr "Unbewohnten Ort bearbeiten"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "Insel"
@@ -18951,5 +19037,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "Insel bearbeiten"
@@ -18957,5 +19043,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr "Höhleneingang"
@@ -18963,10 +19049,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr "Höhleneingang bearbeiten"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "Bergspitze"
@@ -18974,10 +19060,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "Bergspitze bearbeiten"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr "Gletscher"
@@ -18985,10 +19071,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr "Gletscher bearbeiten"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr "Vulkan"
@@ -18996,70 +19082,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr "Vulkan bearbeiten"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr "Grenzen"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr "Staat"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr "Staatsgrenze bearbeiten"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr "Innerstaatlich"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr "Innerstaatliche Grenze bearbeiten"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr "Zivil"
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr "Zivilrechtliche Grenze bearbeiten"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr "Politisch"
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr "Politische Grenze bearbeiten"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr "Nationalpark"
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr "Nationalparkgrenze bearbeiten"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr "Landnutzung"
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "Baum"
@@ -19068,15 +19154,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "Baum bearbeiten"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr "Botanischer Name"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr "Naturwald"
@@ -19085,5 +19171,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr "Naturwald bearbeiten"
@@ -19091,17 +19177,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr "Nadelwald"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr "Laubwald"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr "Mischwald"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "Forst"
@@ -19110,14 +19196,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr "Forst bearbeiten"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr "Naturdenkmal & Reservat"
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr "Naturdenkmal oder Reservat bearbeiten"
@@ -19125,25 +19211,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr "Geröll"
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr "Geröll bearbeiten"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr "Buschland"
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr "Buschland bearbeiten"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr "Gebirge"
@@ -19151,10 +19237,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr "Gebirge bearbeiten"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr "Heide"
@@ -19162,5 +19248,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr "Heide bearbeiten"
@@ -19168,5 +19254,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr "Bauernhof"
@@ -19175,45 +19261,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr "Bauernhof bearbeiten"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr "Ackerland"
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr "Ackerland bearbeiten"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr "Wiese"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr "Wiese bearbeiten"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr "Weinberg"
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr "Weinberg bearbeiten"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr "Schrebergärten"
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr "Schrebergärten bearbeiten"
@@ -19221,25 +19307,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr "Garten"
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr "Garten bearbeiten"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr "Gras"
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr "Grasfläche bearbeiten"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr "Dorfanger"
@@ -19247,10 +19333,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr "Dorfanger bearbeiten"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr "Öffentlicher Bereich"
@@ -19258,20 +19344,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr "Öffentlichen Bereich bearbeiten"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr "Park bearbeiten"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr "Erholungsgebiet"
@@ -19279,5 +19365,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr "Erholungsgebiet bearbeiten"
@@ -19285,15 +19371,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr "Wohngebiet"
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr "Wohngebiet bearbeiten"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr "Kleiner Friedhof"
@@ -19301,9 +19387,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr "Kleinen Friedhof bearbeiten"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr "Friedhof"
@@ -19311,39 +19397,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr "Friedhof bearbeiten"
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr "Einkaufsbereich"
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr "Einkaufsbereich bearbeiten"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr "Gewerbegebiet"
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr "Gewerbegebiet bearbeiten"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr "Industrie"
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr "Industriegebiet bearbeiten"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr "Eisenbahngelände"
@@ -19351,15 +19437,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr "Eisenbahngelände bearbeiten"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr "Militärgebiet"
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr "Militärgebiet bearbeiten"
@@ -19367,55 +19453,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr "Baustellengebiet"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr "Baustelle bearbeiten"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr "Baulücke"
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr "Baulücke bearbeiten"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr "Bauland"
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr "Bauland bearbeiten"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr "Deponie"
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr "Deponie bearbeiten"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr "Steinbruch"
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr "Steinbruch bearbeiten"
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -19425,5 +19511,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr "Ein Multipolygon bearbeiten"
@@ -19432,10 +19518,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr "Äußeres Segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr "Inneres Segment"
@@ -19443,5 +19529,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr "Abbiegeeinschränkung"
@@ -19450,5 +19536,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr "Abbiegeeinschränkung bearbeiten"
@@ -19456,34 +19542,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr "Einschränkung"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr "Nicht links abbiegen"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr "Nicht rechts abbiegen"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr "Nicht geradeaus"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr "Wendeverbot"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr "Nur rechts abbiegen"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr "Nur links abbiegen"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr "Nur geradeaus"
@@ -19492,15 +19578,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr "Von Weg"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr "Über Knoten oder Weg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr "Zu Weg"
@@ -19508,5 +19594,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr "Route"
@@ -19515,5 +19601,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr "Route bearbeiten"
@@ -19521,5 +19607,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr "Routentyp"
@@ -19591,24 +19677,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr "Fahrrad"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr "Bus"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr "Straße"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr "Fähre"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr "Ski"
@@ -19661,20 +19747,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr "Fuß"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr "Wandern"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr "Straßenbahn"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr "Umleitung"
@@ -19688,10 +19774,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr "U-Bahn"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr "Symbolbeschreibung"
@@ -19699,26 +19785,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr "Netzwerk"
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+msgid "Route state"
+msgstr "Routenstatus"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr "geplant"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr "alternativ"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr "temporär"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr "Verbindung"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr "Farbe (hex)"
@@ -19727,30 +19818,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr "Routenabschnitt"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr "Vorwärts-Abschnitt"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr "Rückwärts-Abschnitt"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr "Haltepunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr "Vorwärts-Haltepunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr "Rückwärts-Haltepunkt"
@@ -19786,6 +19877,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19801,5 +19893,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19818,5 +19918,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr "Standard"
@@ -19910,7 +20010,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr "Brücke"
@@ -20175,15 +20275,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr "veraltet"
@@ -20225,5 +20325,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr "Pferd"
@@ -20361,4 +20461,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20370,5 +20476,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20376,5 +20482,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20411,5 +20517,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20433,11 +20539,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr "Barriere"
@@ -20461,5 +20567,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20500,7 +20606,7 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
-msgstr ""
+msgstr "Autostraße"
 
 #. color tertiary
@@ -20536,6 +20642,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr "Straße"
@@ -20591,7 +20697,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr "Weg"
@@ -20644,11 +20750,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr "Eisenbahn"
@@ -20669,5 +20783,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr "Service"
@@ -20681,5 +20795,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr "Furt"
@@ -20700,5 +20814,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr "Wendekreis"
@@ -20712,6 +20826,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr "Notfallrettungspunkt"
@@ -20726,5 +20840,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr "Flussufer"
@@ -20738,5 +20852,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr "Fluss"
@@ -20750,5 +20864,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr "Dock"
@@ -20776,5 +20890,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr "Aquädukt"
@@ -20917,5 +21031,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20942,13 +21056,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr "Zivilisationsbauten"
@@ -21010,7 +21124,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr "Eisenbahnpunkt"
@@ -21033,10 +21147,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr "Andere Bahnen"
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr "Eisenbahn-Überlagerung"
@@ -21072,7 +21186,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr "Alte Eisenbahn"
@@ -21117,6 +21231,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr "Rollweg"
@@ -21130,5 +21244,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr "Terminal"
@@ -21150,5 +21264,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr "Rollweg (dunkel)"
@@ -21162,5 +21276,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr "Rollweg (hell)"
@@ -21168,4 +21282,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21208,7 +21329,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr "Luftweg"
@@ -21225,5 +21346,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr "Einfache Piste"
@@ -21238,5 +21359,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr "Mittelschwere Piste"
@@ -21251,5 +21372,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr "Fortgeschrittenenpiste"
@@ -21264,5 +21385,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr "Expertenpiste"
@@ -21277,5 +21398,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr "freie Piste"
@@ -21290,5 +21411,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr "Anfängerpiste"
@@ -21311,4 +21432,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -21319,4 +21447,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -21393,10 +21529,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr "Strom"
@@ -21410,5 +21547,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr "Anlegestelle (Pier)"
@@ -21422,5 +21559,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr "Pipeline"
@@ -21548,12 +21685,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr "Freizeit"
@@ -21567,5 +21704,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr "Jachthafen"
@@ -21637,8 +21774,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr "Einrichtungen"
@@ -21740,10 +21877,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr "Verkehrseinrichtungen"
@@ -21763,4 +21900,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21782,4 +21926,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -22103,4 +22254,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -22127,24 +22286,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr "Einrichtungen (hell)"
@@ -22176,6 +22343,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr "Wasser (hell)"
@@ -22236,8 +22403,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr "Gesundheit"
@@ -22590,26 +22757,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr "Geschäft"
@@ -22664,5 +22831,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22681,8 +22848,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr "Hotel"
@@ -22832,9 +22999,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr "Tourismus"
@@ -22906,8 +23073,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr "Historisch"
@@ -22978,8 +23145,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr "Grün"
@@ -22993,5 +23160,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr "Steinbruch"
@@ -23005,5 +23172,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr "Mülldeponie"
@@ -23025,5 +23192,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr "Wasserbecken"
@@ -23037,5 +23204,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr "Forst"
@@ -23049,5 +23216,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr "Farmland"
@@ -23070,5 +23237,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr "Einkaufsbereich"
@@ -23082,5 +23249,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr "Industriegebiet"
@@ -23094,5 +23261,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr "Baulücke"
@@ -23106,5 +23273,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr "Bauland"
@@ -23118,5 +23285,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr "Eisenbahnland"
@@ -23173,7 +23340,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr "Militär"
@@ -23187,5 +23354,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr "Friedhof"
@@ -23198,5 +23365,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr "Berggipfel"
@@ -23211,5 +23378,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr "Gletscher"
@@ -23223,5 +23390,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr "Vulkan"
@@ -23276,8 +23443,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr "Natur"
@@ -23291,5 +23458,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr "Buschland"
@@ -23303,5 +23470,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr "Heide"
@@ -23315,5 +23482,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr "Naturwald"
@@ -23327,5 +23494,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr "Schlick & Moor"
@@ -23339,5 +23506,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr "Strand"
@@ -23415,8 +23582,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr "Route"
@@ -23464,7 +23631,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr "Grenze"
@@ -23606,10 +23773,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr "Ort"
@@ -23657,6 +23824,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr "Adresse"
Index: /applications/editors/josm/i18n/po/el.po
===================================================================
--- /applications/editors/josm/i18n/po/el.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/el.po	(revision 17069)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
 "PO-Revision-Date: 2009-07-09 11:26+0000\n"
 "Last-Translator: alichani <alichani@yahoo.co.uk>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-10 11:57+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -56,6 +56,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -100,6 +100,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "Σφάλμα"
@@ -112,5 +112,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "Μη αποθηκευμένες αλλαγές"
@@ -130,10 +130,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -150,15 +150,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -188,6 +188,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -217,5 +217,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -371,5 +371,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
 msgstr ""
@@ -453,9 +453,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -488,7 +488,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -571,37 +571,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "δεδομένα"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "επίπεδο"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "επιλογή"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "σύγκρουση"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "λήψη"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Ζουμ στο {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Ζουμ στο {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -611,30 +611,30 @@
 msgstr "Προβολή: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "Δεν υπάρχει επιλογή στην οποία να γίνει ζουμ."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "Καμοία διένεξη για να γίνει ζουμ"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -642,13 +642,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "Επιβεβαίωση συνδυασμού"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "Αλλαγή κατευθήνσεων;"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -656,10 +656,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "Αντισροφή και Συνδυασμός"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -667,20 +667,20 @@
 msgstr "Εισάγετε τιμές για όλες τισ διενέξεις."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Επίλυση διενέξεων"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "Όλοι οι δρόμοι ήταν άδειοι"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -725,6 +725,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -746,6 +746,6 @@
 msgstr "Διαγραφή επιλεγμένων αντικειμένων."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -755,5 +755,5 @@
 msgstr "Αντικατάσταση"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -886,7 +886,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "Εξαγωγή των δεδομένων σε αρχείο GPX."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -902,5 +901,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -918,5 +917,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -989,22 +988,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "Συγχώνευση Κόμβων"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "Συγχώνευση κόμβων στον παλαιότερο."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "Παρακαλώ επιλέξτε τουλάχιστον δύο κόμβους για συγχώνευση."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr "Συγχώνευση κόμβων  με διαφορετικές συμμετοχές;"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1014,13 +1013,13 @@
 "συγχωνεύσετε;"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "Επιβεβαίωση συγχώνευσης"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1276,7 +1275,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "Δεν βρέθηκε διασταύρωση. Τίποτα δεν αλλάχθηκε."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1867,5 +1865,5 @@
 msgstr "Σφάλματα κατά την λήψη"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1877,5 +1875,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr ""
@@ -1912,11 +1910,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2058,5 +2056,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2131,5 +2129,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Αναζήτηση αντικειμένων."
@@ -2255,5 +2253,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Αναζήτηση"
@@ -2451,5 +2449,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2492,5 +2490,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr "Διαγραφή από σχέση"
@@ -2532,9 +2530,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "Συγχώνευση {0} κόμβων"
-msgstr[1] "Συγχώνευση {0} κόμβων"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2570,9 +2568,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "{0} κόμβος"
-msgstr[1] "{0} κόμβοι"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2736,7 +2734,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "Αλλαγή {0} αντικειμένου"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2746,5 +2744,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2791,5 +2789,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2822,5 +2820,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2834,5 +2832,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "σιδηρόδρομος"
@@ -2847,5 +2845,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3129,5 +3127,5 @@
 msgstr "Να μην εμφανιστεί ξανά"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3136,5 +3134,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3144,10 +3142,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3155,25 +3153,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "άγνωστο"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3183,9 +3181,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3194,9 +3192,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "Μη Αναμενόμενη Εξαίρεση"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3206,9 +3216,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "Άγνωστος υπολογιστής"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3218,5 +3228,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr ""
@@ -3302,10 +3312,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "Όνομα χρήστη"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "Κωδικός"
@@ -3511,15 +3521,15 @@
 msgstr "(κανένα αντικείμενο)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "το επίπεδο δεν είναι στη λίστα."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3573,5 +3583,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr ""
@@ -3580,5 +3590,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr ""
@@ -3587,20 +3597,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3610,6 +3620,6 @@
 msgstr "Ετικέτες"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3617,6 +3627,6 @@
 msgstr "Κόμβοι"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3624,40 +3634,40 @@
 msgstr "Μέλη"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3665,74 +3675,74 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "Επίλυση σύγκρουσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr "το αντικείμενο {0} δεν βρέθηκε στην λίστα"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr "κλείδωμα κύλισης"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr "Σύγκριση "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr "Η έκδοση μου"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr "Συγχωνευμένη έκδοση"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3740,18 +3750,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr "Η έκδοση τους"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr "> κορυφή"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
@@ -3759,13 +3769,13 @@
 "κόμβων"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3773,5 +3783,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3779,13 +3789,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3793,5 +3803,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3799,21 +3809,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr "Μετακίνηση των επιλεγμένων στοιχείων προς τα πάνω κατά μία θέση"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr "Κάτω"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr "Μετακίνηση των επιλεγμένων στοιχείων προς τα κάτω κατά μία θέση"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3822,28 +3832,28 @@
 msgstr "Αφαίρεση"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr ""
 "Αφαίρεση των επιλεγμένων εγγραφών από την λίστα συγχωνευμένων στοιχείων"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr "Πάγωμα"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr "Πάγωμα της τρέχουσας λίστας συγχωνευμένων στοιχείων"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr "Ξεπάγωμα"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr "Ξεπάγωμα της λίστας συγχωνευμένων στοιχείων και έναρξη συγχώνευσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3851,5 +3861,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3858,5 +3868,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3865,5 +3875,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3872,5 +3882,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -3879,21 +3889,21 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -3903,5 +3913,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -3911,5 +3921,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -3917,19 +3927,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -3938,19 +3948,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr "Η επικοινωνία με τον διακομιστή απέτυχε"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr "Όχι, ακύρωση της λειτουργίας"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -3959,9 +3969,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -3971,13 +3981,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -3985,90 +3995,90 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr "Συντεταγμένες:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr "(κανένα)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "διαγράφηκε"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr "μη διεγραμένο"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr "ορατό (στον διακομιστή)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr "μη ορατό (στον διακομιστή)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr "Διατήρηση των συντεταγμένων μου"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr "Διατήρηση των συντεταγμένων τους"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr "Όχι, ακύρωση"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4078,17 +4088,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4097,14 +4107,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4112,21 +4122,21 @@
 msgstr "Ρόλος"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4134,14 +4144,14 @@
 msgstr "<ακαθόριστο>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4149,7 +4159,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4161,7 +4171,7 @@
 msgstr "Κλειδί"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4174,45 +4184,45 @@
 msgstr "Τιμή"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr ""
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ">"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4232,8 +4242,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4272,5 +4282,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4374,83 +4384,83 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "Επίπεδα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "Άνοιγμα λίστας όλων τον φορτωμένων απιπέδων."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "Διαγραφή του επιλεγμένου επιπέδου."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr "Διαγραφή Επιπέδου"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "Εμφάνιση/Απόκρυψη"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "Εναλλαγή κατάστασης ορατότητας του επιλεγμένου επιπέδου."
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "Μετακίνηση του επιλεγμένου επιπέδου μία γραμμή πάνω."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "Μετακίνηση του επιλεγμένου επιπέδου μία γραμμή κάτω."
@@ -4460,6 +4470,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4468,22 +4478,22 @@
 msgstr[1] "Αυτό θα αλλάξει εώς {0} αντικείμενα."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "Κενή τιμή διαγράφει το κλειδί."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<διαφορετικά>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "Αλλαγή τιμών;"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4491,5 +4501,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4498,41 +4508,41 @@
 msgstr[1] "Αλλαγή ιδιοτήτων εώς {0} αντικειμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "Παρακαλώ επιλέξτε κλειδί"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "Παρακαλώ επιλέξτε μια τιμή"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 "Παρακαλώ επιλέξτε τα αντικείμενα των οποίων τις ιδιότητες θέλετε να αλλάξετε."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "Ιδιότητες/Υπαγωγές"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "Ιδιότητες επιλεγμένων αντικειμένων."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "Μέλος του"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "Προσθήκη Ιδιοτήτων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4549,39 +4559,39 @@
 msgstr "Προσθήκη"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 msgid "Add a new key/value pair to all objects"
 msgstr "Προσθήκη νέου ζεύγους κλειδιού/τιμής σε όλα τα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "Επεξεργασία Ιδιοτήτων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 msgid "Edit the value of the selected key for all objects"
 msgstr "Επεξεργασία της τιμής του επιλεγμένου κλειδιού για όλα τα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Ιδιότητες: {0} / Υπαγωγές: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "Ιδιότητες / Υπαγωγές"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "Αλλαγή σχέσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Σίγουρα επιθυμήτε την διαγραφή της επιλογής από την σχέση {0};"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "Διαγραφή του επιλεγμένου κλειδιού από όλα τα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "Διαγραφή Ιδιοτήτων"
@@ -4593,5 +4603,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "Σχέσεις"
@@ -4623,31 +4633,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "Τρέχουσα επιλογή"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "Άνοιγμα παραθύρου λίστας επιλογμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "Ζούμ στα επιλεγμένα στοιχεία"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "Ανανέωση της λίστας επιλεγμένων."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "Ζουμ στην επιλογή"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Επιλ.: Σχεσ.:{0} / WaysQ{1} / Κόμβοι:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4655,5 +4665,5 @@
 msgstr "Επιλογή"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4662,5 +4672,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4669,5 +4679,5 @@
 msgstr[1] "{0} σχέσεις"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -4880,7 +4890,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "Διαγραφή της επιλεγμένης σχέσης"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -4963,5 +4972,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5205,5 +5214,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "Τοποθεσίες"
@@ -5250,21 +5259,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "τύπος"
@@ -6064,72 +6073,512 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "Όνομα"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr "Έκδοση {0} δημιουργήθηκε στις {1} από {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr "Έκδοση"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr "Εικόνες για {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr "Ανάγνωση GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Δεν υπάρχει ώρα για το σημείο {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Αδύνατη η ανάγνωση ώρας \"{0}\" από το σημείο {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr "Δεν βρέθηκαν εικόνες με αναγνώσιμη χρονοσήμανση."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "Ανάγνωση {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr "Αρχή GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr "Τέλος GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr "τρέχουσα διαφορά: {0} δευτερόλεπτα"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr "διαφορά στη ζώνη ώρας: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "εικόνα"
+msgstr[1] "εικόνες"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} μέσα στο ίχνος"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "Συγχρονισμός ρολογιού"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "Εικόνες JPEG (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Η ημερομηνία στο αρχείο \"{0}\" δεν μπόρεσε να ερμηνευθεί."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Δεν υπάρχει ώρα EXIF μέσα στο αρχείο \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "Εικόνα"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Εισάγετε την εμφνιζόμενη ημερομηνία (μμ/ηη/εεεε ΩΩ:ΛΛ:ΔΔ)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr "ζώνη ώρας της συσκευής GPS (διαφορά από την φωτογραφία)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr "Συγχρονισμός Ώρας με τη μονάδα GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr "Η ώρα ποθ εισήχθει δεν μπόρεσε να ερμηνευθεί."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr "σημείο gps"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "Προσαρμογή του σχεδιασμού γραμμών"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr "Χρηση καθολικών ρυθμίσεων."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr "Σχεδίαση γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr "ΠΑράλειψη σχεδίασης γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr "Επιλογή προτιμήσεων για τον σχεδιασμό γραμμών"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "Προσαρμογή Χρώματος"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Προκαθορισμένο"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Επιλέξτε ένα χρώμα"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr "Σημάδια από Ονομασμένα Σημεία"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "Εισαγωγή Ήχου"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr "Αρχεία Κυματομορφής (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Σημάδια ήχου από {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "Εισαγωγή εικόνων"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} τροχιά, "
+msgstr[1] "{0} τροχιές, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} διαδρομή, "
+msgstr[1] "{0} διαδρομές, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} σημείο αναφοράς"
+msgstr[1] "{0} σημεία αναφοράς"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr "Όνομα: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr "Περιγραφή: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr "Διάρκεια: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr "Μήκος: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "Μετατροπή σε επίπεδο δεδομένων"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+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>Αν θέλετε να αποστείλετε ίχνη, κοιτάξτε εδώ:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Μετατράπηκε από: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr "Λήψη από OSM κατά μηκός αυτού του ίχνους"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr "Λήψη όλων εντός:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr "{0} μέτρα"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr "Μέγιστη περιοχή ανά αίτημα:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} τετρ. χλμ"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Αυτή η ενέργεια {0} ξεχωριστές<br>αιτήσεις λήψης. Επιθυμείτε<br>να "
+"συνεχίσετε;</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr ""
+"Δεν υπάρχει διαθέσιμο ίχνος GPX  στο επίπεδο για την συσχέτιση με τον ήχο."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Επίπεδο Δεδομένων {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr "εκτός περιοχής λήψης"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr "έκδοση {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "το {0} αποτελείται από:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} διαγράφηκαν.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr "Έκδοση API: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr "Μετατροπή σε επίπεδο GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6138,7 +6587,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6148,445 +6597,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "Όνομα"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr "Έκδοση {0} δημιουργήθηκε στις {1} από {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr "Έκδοση"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr "Εικόνες για {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr "Ανάγνωση GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Δεν υπάρχει ώρα για το σημείο {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Αδύνατη η ανάγνωση ώρας \"{0}\" από το σημείο {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr "Δεν βρέθηκαν εικόνες με αναγνώσιμη χρονοσήμανση."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Ανάγνωση {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr "Αρχή GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr "Τέλος GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr "τρέχουσα διαφορά: {0} δευτερόλεπτα"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr "διαφορά στη ζώνη ώρας: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "εικόνα"
-msgstr[1] "εικόνες"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} μέσα στο ίχνος"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "Συγχρονισμός ρολογιού"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "Εικόνες JPEG (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Η ημερομηνία στο αρχείο \"{0}\" δεν μπόρεσε να ερμηνευθεί."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Δεν υπάρχει ώρα EXIF μέσα στο αρχείο \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "Εικόνα"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Εισάγετε την εμφνιζόμενη ημερομηνία (μμ/ηη/εεεε ΩΩ:ΛΛ:ΔΔ)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr "ζώνη ώρας της συσκευής GPS (διαφορά από την φωτογραφία)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr "Συγχρονισμός Ώρας με τη μονάδα GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr "Η ώρα ποθ εισήχθει δεν μπόρεσε να ερμηνευθεί."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr "σημείο gps"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "Προσαρμογή του σχεδιασμού γραμμών"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "Χρηση καθολικών ρυθμίσεων."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr "Σχεδίαση γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr "ΠΑράλειψη σχεδίασης γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr "Επιλογή προτιμήσεων για τον σχεδιασμό γραμμών"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "Προσαρμογή Χρώματος"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Προκαθορισμένο"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Επιλέξτε ένα χρώμα"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr "Σημάδια από Ονομασμένα Σημεία"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "Εισαγωγή Ήχου"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr "Αρχεία Κυματομορφής (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Σημάδια ήχου από {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "Εισαγωγή εικόνων"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} τροχιά, "
-msgstr[1] "{0} τροχιές, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} διαδρομή, "
-msgstr[1] "{0} διαδρομές, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} σημείο αναφοράς"
-msgstr[1] "{0} σημεία αναφοράς"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr "Όνομα: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr "Περιγραφή: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr "Διάρκεια: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr "Μήκος: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "Μετατροπή σε επίπεδο δεδομένων"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-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>Αν θέλετε να αποστείλετε ίχνη, κοιτάξτε εδώ:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Μετατράπηκε από: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr "Λήψη από OSM κατά μηκός αυτού του ίχνους"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr "Λήψη όλων εντός:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr "{0} μέτρα"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr "Μέγιστη περιοχή ανά αίτημα:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} τετρ. χλμ"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Αυτή η ενέργεια {0} ξεχωριστές<br>αιτήσεις λήψης. Επιθυμείτε<br>να "
-"συνεχίσετε;</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr ""
-"Δεν υπάρχει διαθέσιμο ίχνος GPX  στο επίπεδο για την συσχέτιση με τον ήχο."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Επίπεδο Δεδομένων {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr "εκτός περιοχής λήψης"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr "έκδοση {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "το {0} αποτελείται από:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} διαγράφηκαν.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr "Έκδοση API: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr "Μετατροπή σε επίπεδο GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -6964,5 +6973,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "Αυτοκίνητο"
@@ -6979,16 +6988,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "Ποδήλατο"
@@ -7016,14 +7027,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "Πεζοί"
@@ -7234,19 +7248,19 @@
 msgstr "Γλώσσα"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr "Ενεργοποίηση ενσωματωμένων προεπιλογών"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr ""
@@ -7376,37 +7390,11 @@
 msgstr "Κωδικός διαμεσολαβητή"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Η βασική URL για τον διακομιστή OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Κωδικός χρήστη για τον λογαριασμό OSM. Αφήστε κενό για να μην αποθηκευθεί ο "
-"κωδικός."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "Η βασική URL για τον διακομιστή"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr "Όνομα χρήστη OSM (e-mail)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "Κωδικός OSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -7758,7 +7746,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "Αδυναμία ανάγνωσης \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -7863,7 +7851,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "Άγνωστος ρόλος \"{0}\"."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8021,23 +8009,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "Λανθασμένος κωδικός ή όνομα χρήστη"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Προειδοποίηση: Ο κωδικός μεταδίδεται χωρίς κρυπτογράφηση"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "Αποθήκευση χρήστη και κωδικού (χωρίς κρυπτογράφηση)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "Εισάγετε κωδικό"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
 msgstr "Είσοδος"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr ""
+"Κωδικός χρήστη για τον λογαριασμό OSM. Αφήστε κενό για να μην αποθηκευθεί ο "
+"κωδικός."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr "Όνομα χρήστη OSM (e-mail)"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "Κωδικός OSM"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -8200,14 +8214,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "Άγνωστος τύπος μέλους για το \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "Προετοιμασία δεδομένων OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr "Κακοσχηματισμένο id κόμβου"
@@ -8669,5 +8683,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr "Περιγραφή"
@@ -9074,5 +9088,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr "Σφάλμα φόρτωσης αρχείου"
@@ -9404,5 +9418,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -9938,7 +9952,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr "νερό"
@@ -10119,7 +10133,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "όνομα"
+msgstr ""
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10677,12 +10690,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "αρχή"
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0} κόμβος"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -10820,5 +10833,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr "Όνομα οδού"
@@ -11631,7 +11644,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr "κτίριο"
@@ -11645,5 +11658,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr ""
@@ -11876,12 +11889,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "Παρακαλώ επιλέξτε την γραμμή για επεξεργασία."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "Αποθήκευση επιπέδου WMS"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
@@ -11894,7 +11905,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "Δεν υπάρχουν αλλαγές προς αποστολή"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -11905,19 +11915,19 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr "Αυτόματη λήψη"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -11925,42 +11935,42 @@
 "Η ζητούμενη περιοχή είναι πολύ μεγάλη. Παρακαλώ κάντε ζουμ, ή αλλάξτε ανάλυση"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr "Λήψη εμφανών πλακιδίων"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr "Αλλαγή ανάλυσης"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr "Ανανέωση λανθασμένων πλακιδίων"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr "Κανάλι άλφα"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr "Αποθ'ηκευση επιπέδου WMS σε αρχείο"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr "Αποθήκευση επιπέδου WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr "Φόρτωση επιπέδου WMS από αρχείο"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr "Φόρτωση επιπέδου WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Μη υποστηριζόμενη έκδοση αρχείου WMS΄ βρέθηκε {0}, αναμενόταν {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr "Σφάλμα μορφής αρχείου"
@@ -12292,4 +12302,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12326,5 +12338,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr "Οδοί"
@@ -12335,5 +12347,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Αυτοκινητόδρομος"
@@ -12342,5 +12354,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr "Επεξεργασία Αυτοκινητοδρόμου"
@@ -12367,8 +12379,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr ""
@@ -12409,21 +12421,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr "Επίπεδο"
@@ -12437,8 +12449,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr "Λωρίδες κυκλοφορίας"
@@ -12456,15 +12468,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr "Μεγ. Ταχύτητα (χαω)"
@@ -12501,16 +12513,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr "Μονόδρομος"
@@ -12552,19 +12564,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Γέφυρα"
@@ -12600,19 +12612,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr "Σήραγγα"
@@ -12646,18 +12658,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr ""
@@ -12691,18 +12703,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr ""
@@ -12710,5 +12722,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr ""
@@ -12717,5 +12729,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr ""
@@ -12723,5 +12735,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr ""
@@ -12730,5 +12742,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr ""
@@ -12738,6 +12750,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr ""
@@ -12745,5 +12757,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr ""
@@ -12752,5 +12764,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr ""
@@ -12763,5 +12775,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Πρωτεύων"
@@ -12770,5 +12782,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr ""
@@ -12776,10 +12788,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr ""
@@ -12791,5 +12803,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Δευτερεύων"
@@ -12799,5 +12811,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr ""
@@ -12805,5 +12817,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr ""
@@ -12813,5 +12825,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr ""
@@ -12823,5 +12835,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Μη κατηγοριοποιημένος"
@@ -12831,5 +12843,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr ""
@@ -12856,19 +12868,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr "Πλάτος (μέτρα)"
@@ -12880,5 +12892,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Οικιστική"
@@ -12887,5 +12899,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr "Επεξεργασία οικιστικής οδού"
@@ -12909,13 +12921,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr "Επιφάνεια"
@@ -12935,20 +12947,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr ""
@@ -12956,12 +12968,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr ""
@@ -12969,5 +12981,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr ""
@@ -12976,5 +12988,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr ""
@@ -12982,5 +12994,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr ""
@@ -12989,5 +13001,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr ""
@@ -12997,18 +13009,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr ""
@@ -13016,5 +13028,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr ""
@@ -13024,5 +13036,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -13030,5 +13042,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -13037,5 +13049,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -13044,20 +13056,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr "Διόδια"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr "Αδιέξοδο"
@@ -13070,8 +13082,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr "Πρόσβαση"
@@ -13115,23 +13127,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr "ναι"
@@ -13144,40 +13156,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr "ιδιωτικό"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr ""
@@ -13190,19 +13202,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr "προορισμός"
@@ -13225,65 +13237,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr "αγροτικό"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr "όχι"
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -13298,10 +13310,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr "Άλογο"
@@ -13317,13 +13329,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr "Μοτοσυκλέτα"
@@ -13339,30 +13351,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr "Αυτοκίνητο"
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr ""
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr "Καράβι"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr "Ελαχ. ταχύτητα (χαω)"
@@ -13370,25 +13382,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr "Μεγ. βάρος (τόνοι)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr "Μέγιστο Ύψος (μέτρα)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr "Μέγιστο Πλάτος (μέτρα)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr "Μέγιστο Μήκος (μέτρα)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr "Κυκλικός κόμβος"
@@ -13399,5 +13411,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr ""
@@ -13419,9 +13431,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr "Τύπος"
@@ -13441,10 +13453,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr "Αυτοκινητόδρομος"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr ""
@@ -13466,10 +13478,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr ""
@@ -13491,10 +13503,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr "πρωτεύων"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr ""
@@ -13516,6 +13528,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr "δευτερεύων"
@@ -13529,9 +13541,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr "αταξινόμητος"
@@ -13545,9 +13557,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr "Οικιστική"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr ""
@@ -13577,10 +13589,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr ""
@@ -13588,4 +13600,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13603,6 +13622,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr ""
@@ -13613,10 +13632,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr "Επεξεργασία Γέφυρας"
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr "Σήραγγα"
@@ -13624,19 +13643,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr ""
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr "Επεξεργασία οδού ταχείας κυκλοφορίας υπό κατασκευή"
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr "Κόμβος"
@@ -13652,5 +13671,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr "κυκλικός κόμβος"
@@ -13659,5 +13678,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr ""
@@ -13665,5 +13684,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr ""
@@ -13671,5 +13690,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr "Ποδηλατόδρομος"
@@ -13679,5 +13698,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr "Επεξεργασία ποδηλατόδρομου"
@@ -13685,5 +13704,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr ""
@@ -13692,5 +13711,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr ""
@@ -13698,5 +13717,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr "Πεζόδρομος"
@@ -13705,5 +13724,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr "Επεξεργασία Πεοζόδρομου"
@@ -13711,5 +13730,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr "Σκαλοπάτια"
@@ -13719,5 +13738,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr "Επεξεργασία σκαλοπατιών"
@@ -13726,5 +13745,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr ""
@@ -13733,14 +13752,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr "χαλίκι"
@@ -13748,18 +13767,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr "χόρτο"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr "άμμος"
@@ -13767,5 +13786,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr ""
@@ -13774,5 +13793,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr ""
@@ -13780,5 +13799,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr ""
@@ -13787,5 +13806,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr ""
@@ -13793,5 +13812,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr ""
@@ -13800,5 +13819,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr ""
@@ -13806,5 +13825,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr ""
@@ -13813,5 +13832,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr ""
@@ -13819,5 +13838,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr ""
@@ -13826,5 +13845,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -13833,5 +13852,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr "Μονοπάτι"
@@ -13840,13 +13859,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr "Επεξεργασία μονοπατιού"
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr "Snowmobile"
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr "Σκι"
@@ -13854,5 +13873,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr "Πεζοπορία"
@@ -13862,5 +13881,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr "Επεξεργασία Πεζοπορίας"
@@ -13868,5 +13887,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr "Ορειβασία"
@@ -13876,5 +13895,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr "Επεξεργασία Ορειβασίας"
@@ -13882,5 +13901,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr "Απαιτητική Ορειβασία"
@@ -13890,5 +13909,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Επεξεργασία απαιτητικής ορειβασίας"
@@ -13896,5 +13915,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr ""
@@ -13904,5 +13923,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr ""
@@ -13910,5 +13929,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr ""
@@ -13918,5 +13937,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr ""
@@ -13924,5 +13943,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr ""
@@ -13932,5 +13951,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr ""
@@ -13938,10 +13957,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr "Σημεία αναφοράς"
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr "Κόμβος Αυτοκινητοδρόμου"
@@ -13949,15 +13968,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr "Επεξεργασία Κόμβου Αυτοκινητοδρόμου"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr "Αριθμός"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr "Υπηρεσίες"
@@ -13965,5 +13984,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr ""
@@ -13998,14 +14017,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr "Λειτουργός"
@@ -14014,5 +14033,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr "Σηματοδότης"
@@ -14022,5 +14041,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr "Τύπος διάβασης πεζών"
@@ -14029,27 +14048,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr "σηματοδότες"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr "νησίδα"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr ""
@@ -14057,6 +14076,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr ""
@@ -14065,11 +14084,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -14077,30 +14096,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr "Stop"
@@ -14108,5 +14127,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr "Διάβαση Πεζών"
@@ -14115,14 +14134,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr "Επεξεργασία Διάβασης Πεζών"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr "Μικρός Κυκλικός Κόμβος"
@@ -14133,14 +14152,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr "Κατεύθυνση"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr "δεξιόστροφα"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr ""
@@ -14150,20 +14169,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr "Όρια πόλης"
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr "Επεξεργασία πινακίδας ορίων πόλης"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr "Δεύτερο Όνομα"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr "Κάμερα ελέγχου ταχύτητας"
@@ -14171,5 +14190,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr "Τηλέφωνο εκτάκτου ανάγκης"
@@ -14177,5 +14196,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr ""
@@ -14183,5 +14202,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr ""
@@ -14190,10 +14209,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr ""
@@ -14201,5 +14220,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr ""
@@ -14207,5 +14226,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -14217,7 +14236,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr "Υψόμετρο"
@@ -14225,5 +14244,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr "Εμπόδια"
@@ -14231,5 +14250,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr ""
@@ -14237,5 +14256,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr ""
@@ -14274,18 +14293,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr "Επιτρεπόμενα οχήματα:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr ""
@@ -14294,5 +14317,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr ""
@@ -14300,5 +14323,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr ""
@@ -14306,10 +14329,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr ""
@@ -14317,15 +14340,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr "Σταθμός Διοδίων"
@@ -14333,5 +14356,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr "Επεξεργασία Σταθμού Διοδίων"
@@ -14339,10 +14362,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr "Συνοριακός Σταθμός"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr "Επεξεργασία Συνοριακού Σταθμού"
@@ -14352,5 +14375,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr "Φράκτης θάμνων"
@@ -14359,5 +14382,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr "Φράκτης"
@@ -14366,5 +14389,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr "Τοίχος"
@@ -14372,5 +14395,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr ""
@@ -14379,5 +14402,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr ""
@@ -14389,15 +14412,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr "Είσοδος"
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr "Επεξεργασία Εισόδου"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr "Πύλη"
@@ -14405,50 +14428,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr "Επεξεργασία Πύλης"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr ""
@@ -14456,15 +14479,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+#, fuzzy
+msgid "Turnstile"
+msgstr "Περιστρεφόμενη πλατφόρμα"
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "Σήραγγα"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr ""
@@ -14475,10 +14510,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr "Νερό"
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr "Πηγή"
@@ -14486,5 +14521,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr "Επεξεργασία πηγής"
@@ -14492,5 +14527,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr ""
@@ -14498,10 +14533,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr "Υδατόρρευμα"
@@ -14509,10 +14544,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr "Επεξεργασία Υδατορρεύματος"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr "Κανάλι"
@@ -14520,10 +14555,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr "Επεξεργασία Καναλιού"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr "Ποταμός"
@@ -14533,5 +14568,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr "Επεξεργασία ποταμού"
@@ -14539,15 +14574,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr "Επεξεργασία νερού"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr "Ξηρά"
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr "Επεξεργασία νερού"
@@ -14555,15 +14590,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr "Λεκάνη"
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr "Ταμιευτήρας"
@@ -14571,15 +14606,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr "Επεξεργασία Ταμιευτήρα"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr "Καλυμένος Ταμιευτήρας"
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr "Επεξεργασία Καλυμένου Ταμιευτήρα"
@@ -14587,5 +14622,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr "Όχθη ποταμού"
@@ -14594,10 +14629,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr "Επεξεργασία όχθης ποταμού"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr ""
@@ -14608,14 +14643,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr "Βάλτος"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr ""
@@ -14629,35 +14664,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr "έλος"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr "Λάσπη"
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr "Παραλία"
@@ -14665,20 +14700,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr "Επεξεργασία παραλίας"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr "Όρμος"
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr "Επεξεργασία όρμου"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr "Λόφος"
@@ -14686,10 +14721,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr "Επεξεργασία λόφου"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr "Ακτογραμμή"
@@ -14697,5 +14732,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr "Επεξεργασία Ακτογραμμής"
@@ -14703,5 +14738,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr ""
@@ -14709,5 +14744,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr ""
@@ -14716,5 +14751,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr ""
@@ -14722,10 +14757,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr ""
@@ -14733,5 +14768,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr ""
@@ -14739,5 +14774,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr "Φράγμα"
@@ -14745,15 +14780,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr "Επεξεργασία Φweirράγματος"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr ""
@@ -14762,5 +14797,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr "Φράγμα εκτροπής"
@@ -14768,20 +14803,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr "Επεξεργασία φράγματος εκτροπής"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr "Καταρράκτης"
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr "Επεξεργασία Καταράκτη"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr ""
@@ -14790,15 +14825,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr "Αποβάθρα"
@@ -14806,10 +14841,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr "Επεξεργασία Αποβάθρας"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr ""
@@ -14817,10 +14852,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr ""
@@ -14830,5 +14865,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr ""
@@ -14836,10 +14871,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr "Σιδηρόδρομος"
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr "Σιδηροτροχιά"
@@ -14847,5 +14882,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr "Επεξεργασία σιδηροτροχιάς"
@@ -14875,8 +14910,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr ""
@@ -14890,35 +14925,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr ""
@@ -14926,45 +14961,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr ""
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr ""
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr "Υπόγειος Σιδηρόδρομος"
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr "Επεξεργασία υπογείου σιδηροδρόμου"
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr "Τραμ"
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr "Επεξεργασία Τραμ"
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr ""
@@ -14972,5 +15007,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -14979,14 +15014,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr ""
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr ""
@@ -14995,5 +15030,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr "Ισόπεδη διάβαση"
@@ -15002,5 +15037,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr "Φυλασόμενη Διάβαση"
@@ -15010,5 +15045,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr "Είδος Διάβασης"
@@ -15016,5 +15051,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr "Περιστρεφόμενη πλατφόρμα"
@@ -15023,10 +15058,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr ""
@@ -15034,10 +15069,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr ""
@@ -15045,10 +15080,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr ""
@@ -15056,10 +15091,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr ""
@@ -15067,5 +15102,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr ""
@@ -15073,5 +15108,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr "Σταθμός"
@@ -15082,10 +15117,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr "Επεξεργασία Σταθμού"
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr "Καύσιμα"
@@ -15095,5 +15130,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr "Επεξεργασία καυσίμων"
@@ -15109,5 +15144,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15117,5 +15152,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr "Επεξεργασία Χώρου Στάθμευσης"
@@ -15123,41 +15158,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr "Χωρητικότητα"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr "επιφάνεια"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr "πολυόροφο"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr "υπόγειο"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr "Θέσεις αναπήρων"
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr "Κόστος"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr "Πλυντήριο"
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr "Επεξεργασία πλυντηρίου"
@@ -15165,5 +15200,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr "Κατάστημα"
@@ -15171,15 +15206,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr "Επεξεργασία Καταστήματος"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr "Συνεργείο Αυτοκινήτων"
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr "Επεξεργασία Συνεργείου Αυτοκινήτων"
@@ -15187,5 +15222,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr "Ενοικίαση"
@@ -15194,10 +15229,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr "Επεξεργασία Ενοικίασης"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr "Κοινή χρήση"
@@ -15205,5 +15240,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr "Επεξεργασία κοινής χρήσης αυτοκινήτου"
@@ -15211,5 +15246,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr "Επεξεργασία χώρου στάθμευσης ποδηλάτων"
@@ -15218,5 +15253,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr "Επεξεργασία Ενοικίασης ποδηλάτων"
@@ -15225,15 +15260,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr "Επεξεργασία Καταστήματος Ποδηλάτων"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "Μέσα Μαζικής Μεταφοράς"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr ""
@@ -15241,5 +15276,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr ""
@@ -15247,5 +15282,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr ""
@@ -15253,5 +15288,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr "Στάση Τραμ"
@@ -15260,5 +15295,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr "Επεξεργασία Στάσης Τραμ"
@@ -15266,5 +15301,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr ""
@@ -15273,5 +15308,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr ""
@@ -15283,5 +15318,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr ""
@@ -15289,10 +15324,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr "Είσοδος υπογείου σιδηρόδρομου"
@@ -15301,10 +15336,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr "Επεξεργασία εισόδου υπογείου σιδηρόδρομου"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr "Αναπηρικό καρότσι"
@@ -15313,5 +15348,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr "Σταθμός Λεωφορείων"
@@ -15320,5 +15355,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr "Επεξεργασία Σταθμού Λεωφορείων"
@@ -15326,5 +15361,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr "Στάση Λεωφορείου"
@@ -15334,5 +15369,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr "Επεξεργασία Στάσης Λεωφορείου"
@@ -15343,6 +15378,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr "Καταφύγιο"
@@ -15350,10 +15385,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr ""
@@ -15361,5 +15396,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr "Ταξί"
@@ -15367,5 +15402,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr "Επεξεργασία σταθμού ταξί"
@@ -15373,5 +15408,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr "Αεροδρόμιο"
@@ -15379,15 +15414,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr "Επεξεργασία Αεροδρομίου"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr "ICAO"
@@ -15396,5 +15431,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr "Διαμονή"
@@ -15406,5 +15441,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Ξενοδοχείο"
@@ -15413,15 +15448,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr "Επεξεργασία Ξενοδοχείου"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr "Αστέρια"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr ""
@@ -15429,20 +15464,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr "Ξενώνας"
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr "Επεξεργασία Ξενώνα"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr "Σαλέ"
@@ -15450,10 +15485,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr "Επεξεργασία Σαλέ"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr ""
@@ -15461,30 +15496,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr "Χώρος Τροχόσπιτων"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr "Επεξεργασία Χώρου Τροχόσπιτων"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr "Χώρος Κάμπινγκ"
@@ -15492,10 +15527,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr "Επεξεργασία Χώρου Κάμπινγκ"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "Φαγητό+Ποτά"
@@ -15506,5 +15541,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Εστιατόριο"
@@ -15512,5 +15547,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr "Επεξεργασία Εστιατορίου"
@@ -15518,5 +15553,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr "Κουζίνα"
@@ -15524,61 +15559,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr "ιταλική"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr "κινέζικη"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr "ελληνική"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr "γερμανική"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr "ινδική"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr "τοπική"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr "τουρκική"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr "ασιατική"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr "ταϊλανδέζικη"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr "μεξικάνικη"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr "ιαπωνική"
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -15586,9 +15621,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr "Επεξεργασία Εστιατορίου Fast Food"
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr "Καφέ"
@@ -15596,10 +15631,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr "Επεξεργασία Καφέ"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr "Pub"
@@ -15607,20 +15642,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr "Επεξεργασία Pub"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr "Μπαρ"
@@ -15628,10 +15663,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr "Επεξεργασία Μπαρ"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr "Νυχτερινό Κέντρο"
@@ -15639,20 +15674,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr "Νυχτερινό Κέντρο"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "Τουρισμός"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr ""
@@ -15661,11 +15696,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr "Ώρες Λειτουργείας"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "Μουσείο"
@@ -15673,10 +15708,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr "Επεξεργασία Μουσείου"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "Ζωολογικός Κήπος"
@@ -15685,10 +15720,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr "Επεξεργασία Ζωολογικού Κήπου"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr ""
@@ -15696,25 +15731,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr "Πύργος Παρατήρησης"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr "Θεματικό Πάρκο"
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr "Επεξεργασία Θεματικού Πάρκου"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr ""
@@ -15722,5 +15757,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr ""
@@ -15728,5 +15763,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr "Γραφείο Πληροφοριών"
@@ -15734,80 +15769,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr "Επεξεργασία Γραφείου Πληροφοριών"
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "Χάρτης"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr "Τύπος Χάρτη"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr "χάρτης"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr "χάρτης πόλης"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr "χάρτης πεζοπορίας"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr "χάρτης ποδηλατοδρομίας"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
 msgid "Closer Description"
 msgstr ""
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1701
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Board Type"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "board"
 msgstr ""
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "history"
 msgstr "ιστορία"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "wildlife"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Guidepost (Hiking)"
 msgstr ""
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr ""
@@ -15815,25 +15850,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr "Τζάκι"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "Ιστορικά Σημεία"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "Κάστρο"
@@ -15842,20 +15877,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr "Επεξεργασία Κάστρου"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "Ερείπια"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr "Επεξεργασία Ερειπίων"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr "Αρχαιολογικός Χώρος"
@@ -15864,10 +15899,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr "Επεξεργασία Αρχαιολογικού Χώρου"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr "Πεδίο Μάχης"
@@ -15875,5 +15910,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr "Επεξεργασία Πεδίου Μάχης"
@@ -15881,15 +15916,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr "Μνημείο"
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr "Επεξεργασία Μνημείου"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr "Ηρώο"
@@ -15897,45 +15932,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr "Επεξεργασία Ηρώου"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "Αναψυχή"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "Παιδική Χαρά"
@@ -15943,15 +15978,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr "Επεξεργασία Παιδικής Χαράς"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "Ψάρεμα"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr "Επεξεργασία Ψαρέματος"
@@ -15959,15 +15994,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr "Χώροι Άθλησης"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "Στάδιο"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr "Επεξεργασία Σταδίου"
@@ -15981,6 +16016,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "επιλέξτε άθλημα:"
@@ -16003,4 +16038,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -16061,5 +16104,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16069,5 +16120,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16213,5 +16264,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16317,5 +16368,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16356,29 +16407,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr "άθληση"
@@ -16388,227 +16440,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr "τοξοβολία"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr "Καλαθοσφαίρηση"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr "Κανόε"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr "αναρρήχηση"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr "ποδηλασία"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr "κυνοδρομίες"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr "ποδόσφαιρο"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr "σκοποβολή"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "ποδόσφαιρο"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr "κολύμβηση"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "επιτραπέζια αντισφαίρηση"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr "αντισφαίρηση"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr "Αθλητικό Κέντρο"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr "Επεξεργασία Αθλητικού Κέντρου"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr ""
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr "Μίνι Golf"
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr "Επεξεργασία Μίνι Golf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr "Άθλημα"
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr "Πολλαπλά"
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr ""
@@ -16647,191 +16699,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr "αθλητικό κέντρο"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr "στάδιο"
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr "Τοξοβολία"
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr "Επεξεργασία τοξοβολίας"
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr "Αναρρήχηση"
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr "Επεξεργασία Αναρρήχησης"
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr ""
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr "Ποδηλασία"
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr "Επεξεργασία Ποδηλασίας"
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr "Κυνοδρομίες"
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr "Επεξεργασία Κυνοδρομιών"
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr "Ιππικό"
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr "Επεξεργασία Ιππικού"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr "Μηχανοκίνητα Αθλήματα"
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr "Επεξεργασία Μηχανοικίνητων  Αθλημάτων"
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr "Κολύμβηση"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr "Επεξεργασία Κολύμβησης"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr ""
@@ -16839,56 +16891,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr "Δυσκολία"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr "αρχαρίων"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr "εύκολη"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr "Σκοποβολή"
@@ -16896,178 +16948,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr "Επεξεργασία Σκοποβολής"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr "Ποδόσφαιρο"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr "Επεξεργασία Ποδοσφαίρου"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr "Ποδόσφαιρο"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr "Επεξεργασία Baseball"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr "Καλαθοσφαίρηση"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr "Επεξεργασία Καλαθοσφαίρησης"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr "Επεξεργασία Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr "Επεξεργασία Hockey"
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr "Επεξεργασία Rugby"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr "Επιτραπέζια Αντισφαίριση"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr "Επεξεργασία Επιτραπέζιας Αντισφαίρισης"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr "Αντισφαίριση"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr "Επεξεργασία Αντισφαίρισης"
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "Κτήρια"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr "Κτήριο"
@@ -17075,5 +17127,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "Δημόσιο Κτήριο"
@@ -17081,10 +17133,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr "Επεξεργασία Δημοσίου Κτηρίου"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "Δημαρχείο"
@@ -17092,10 +17144,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "Επεξεργασία Δημαρχείου"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "Πρεσβεία"
@@ -17103,10 +17155,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "Επεξεργασία Πρεσβείας"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "Δικαστήρια"
@@ -17115,10 +17167,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "Επεξεργασία Δικαστηρίων"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "Φυλακή"
@@ -17127,10 +17179,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "Επεξεργασία Φυλακής"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "Αστυνομία"
@@ -17140,10 +17192,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "Επεξεργασία Αστυνομίας"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "Πυροσβεστείο"
@@ -17152,10 +17204,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "Επεξεργασία Πυροσβεστείου"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "Ταχυδρομείο"
@@ -17163,5 +17215,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr "Επεξεργασία Ταχυδρομείου"
@@ -17169,15 +17221,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr "Νηπιαγωγίο"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr "Επεξεργασία Νηπιαγωγίου"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "Σχολείο"
@@ -17185,10 +17237,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "Επεξεργασία Σχολείου"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr "Πανεπιστήμιο"
@@ -17196,10 +17248,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr "Επεξεργασία Πανεπιστημίου"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr "Κολέγιο"
@@ -17207,5 +17259,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr "Επεξεργασία Κολεγίου"
@@ -17213,5 +17265,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "Κινηματογράφος"
@@ -17220,10 +17272,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "Επεξεργασία Κινηματογράφου"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "Βιβλιοθήκη"
@@ -17232,10 +17284,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "Επεξεργασία Βιβλιοθήκης"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr "Κέντρο Τεχνών"
@@ -17243,10 +17295,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr "Επεξεργασία Κέντρου Τεχνών"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "Θέατρο"
@@ -17255,10 +17307,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "Επεξεργασία Θεάτρου"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr "Τόπος Λατρείας"
@@ -17268,5 +17320,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr "Επεξεργασία Τόπου Λατρείας"
@@ -17275,6 +17327,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr "Θρησκεία"
@@ -17283,66 +17335,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr "βουδισμός"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr "χριστιανισμός"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr "ινδουϊσμός"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr "ιουδαϊσμός"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr "μουσουλμανισμός"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr "ταοϊσμός"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr "Δόγμα"
@@ -17351,81 +17403,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr "αγγλικανικό"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr "βαπτιστικό"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr "καθολικό"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr "ευαγγελικό"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr "μαρτύρων του Ιεχοβά"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr "λουθερανικό"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr "ορθόδοξο"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr "πεντηκωστής"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr "προτεσταντικό"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr "Διευθύνσεις"
@@ -17434,5 +17486,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr "Επεξεργασία διεύθυνσης"
@@ -17440,5 +17492,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr "Αριθμός σπιτιού"
@@ -17446,20 +17498,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr "Όνομα Σπιτιού"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr "Όνομα πόλης"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "Ταχυδρομικός Κώδικας"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr "Κωδικός χώρας"
@@ -17467,5 +17519,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr "Παρεμβολή Διευθύνσεων"
@@ -17474,5 +17526,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr "Επεξεργασία Παρεμβολής Διευθύνσεων"
@@ -17480,71 +17532,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr "Τρόπος Αρίθμησης"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr "Μονά"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr "Ζυγά"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr "όλα"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "Πύργος"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "Επεξεργασία Πύργου"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "Υδραγωγείο"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "Επεξεργασία Υδραγωγείου"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr "Μετρητής Αερίου"
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr "Επεξεργασία Μετρητή Αερίου"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "Φάρος"
@@ -17552,10 +17604,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "Επεξεργασία Φάρου"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "Ανεμόμυλος"
@@ -17563,10 +17615,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "Επεξεργασία Ανεμόμυλου"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "Αγωγός"
@@ -17574,10 +17626,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "Επεξεργασία Αγωγού"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr "Βιολογικός Καθαρισμός"
@@ -17587,10 +17639,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr "Επεξεργασία Βιολογικού Καθαρισμού"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr "Γερανός"
@@ -17598,10 +17650,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr "Επεξεργασία Γερανού"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr "Φάρος"
@@ -17609,10 +17661,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr "Επεξεργασία Φάρου"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr ""
@@ -17620,10 +17672,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr "Παρακολούθηση"
@@ -17631,5 +17683,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr "Επεξεργασία Κάμερας Παρακολούθησης"
@@ -17637,5 +17689,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr "Γεννήτρια Ρεύματος"
@@ -17645,39 +17697,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr "Επεξεργασία Γεννήτριας Ρεύματος"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr "Αέρας"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr "Νερό"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr "Πυρηνικό"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr "Λιγνίτης"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr "Φωτοβολταϊκό"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr "Αέριο"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr "Σταθμός Παραγωγής Ρεύματος"
@@ -17686,10 +17738,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr "Επεξεργασία Σταθμού Παραγωγής Ρεύματος"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr "Υποσταθμός Ρεύματος"
@@ -17698,5 +17750,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr "Επεξεργασία Υποσταθμού Ρεύματος"
@@ -17704,10 +17756,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr "Πυλώνας Ρεύματος"
@@ -17718,5 +17770,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr "Επεξεργασία Πυλώνα Ρεύματος"
@@ -17724,5 +17776,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr "Αγωγός Μεταφοράς Ρεύματος"
@@ -17731,25 +17783,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr "Επεξεργασία Αγωγού Μεταφοράς Ρεύματος"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr "Τάση ρεύματος"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr "Ποσότητα Αγωγών"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "Τουαλέτες"
@@ -17757,20 +17809,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr "Αριθμός Αναφοράς"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr "Σημείωση"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr "Γραμματοκιβώτιο"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "Τηλέφωνο"
@@ -17779,5 +17831,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr "Επεξεργασία Τηλεφώνου"
@@ -17785,5 +17837,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "Κέρματα"
@@ -17791,5 +17843,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr "Χαρτονομίσματα"
@@ -17797,5 +17849,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -17803,5 +17855,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr "Χρεωστικές Κάρτεσ"
@@ -17809,15 +17861,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "Πιστωτικές Κάρτες"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "Τηλεκάρτες"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr "Ανακύκλωση"
@@ -17826,5 +17878,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr "Επεξεργασία σταθμού Ανακύκλωσης"
@@ -17832,35 +17884,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr "Μπαταρίες"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr "Τενεκεδάκια"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr "Ρούχα"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr "Γυαλί"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr "Χαρτί"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr "Μέταλλα"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr "Παγκάκι"
@@ -17869,20 +17921,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr "Κρυψώνα"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr "Κλειδαριά"
@@ -17890,22 +17942,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr "Ύψος"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr "χαμηλό"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr "μισό"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr "πλήρες"
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr "Συντριβάνι"
@@ -17914,10 +17966,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr "Επεξεργασία Συντριβανίου"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "Πόσιμο Νερό"
@@ -17926,10 +17978,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "Επεξεργασία πόσιμου νερού"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr "Βρεφοδόχος"
@@ -17937,25 +17989,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr "Επεξεργασία Βρεφοδόχου"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "Καταστήματα"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr "Επεξεργασία Supermarket"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr ""
@@ -17963,10 +18015,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr ""
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr "Περίπτερο"
@@ -17974,10 +18026,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr "Επεξεργασία Περιπτέρου"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "Μηχάνημα Πώλησης"
@@ -17985,5 +18037,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "Επεξεργασία Μηχανήματος Πώλησης"
@@ -17991,88 +18043,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "Πωλούμενα Προϊόντα"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr "εισητήρια Μέσων Μαζικής Μεταφοράς"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr "χάρτες Μέσων Μαζικής Μεταφοράς"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr "εισιτήρια Στάθμευσης"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr "φαγητό"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "ποτά"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr "γλυκά"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr "τσιγάρα"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr "φωτογραφίες"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr "τροφές ζώων"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "εφημερίδες"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "Παιχνίδια"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr "Γραμματόσημα"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "Κάρτες SIM"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr "κουπόνια"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr "Προφυλακτικά"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "Κρεοπωλείο"
@@ -18080,10 +18132,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "Επεξεργασία Κρεοπωλείου"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "Φούρνος"
@@ -18091,10 +18143,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "Επεξεργασία Φούρνου"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr "Ανθοπωλείο"
@@ -18102,20 +18154,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr "Επεξεργασία Ανθοπωλείου"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr "Βιολογικά"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr "Επεξεργασία Καταστήματος Βιολογικών"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr ""
@@ -18123,60 +18175,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr ""
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr ""
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr "Υπολογιστές"
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr "Επεξεργασία Καταστήματος Υπολογιστών"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr "Ηλεκτρονικά"
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr "Επεξεργασία Καταστήματος Ηλεκτρονικών"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr "Ηχοσυστήματα"
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr "Επεξεργασία Καταστήματος Ηχοσυστημάτων"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr "Έπιπλα"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr "Επεξεργασία Καταστήματος Επίπλων"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr "Είδη Κήπου"
@@ -18184,10 +18236,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr "Επεξεργασία Καταστήματος Ειδών Κήπου"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr "Σιδηρικά"
@@ -18195,10 +18247,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr "Επεξεργασία Καταστήματος Σιδηρικών"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -18206,60 +18258,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr "Χαρτικά"
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr "Επεξεργασία Χαρτοπωλείου"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr "Κομμωτήριο"
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr "Επεξεργασία Κομμωτηρίου"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr "Υποδήματα"
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr "Επεξεργασία Υποδηματοπωλείου"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr "Παιχνίδια"
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr "Επεξεργασία Καταστήματος Παιχνιδιών"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "Στπγνοκαθαριστήριο"
@@ -18267,10 +18319,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "Επεξεργασία Στεγνοκαθαριστηρίου"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "Πλυντήριο"
@@ -18278,10 +18330,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "Επεξεργασία πλυντηρίου"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr ""
@@ -18289,35 +18341,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr "Αθλητικά"
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr "Επεξεργασία Καταστήματος Αθλητικών"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr ""
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "Μετρητά"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "Τράπεζα"
@@ -18325,5 +18377,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "Επεξεργασία Τράπεζας"
@@ -18331,10 +18383,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "ΑΤΜ"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr "Συναλλακτήριο"
@@ -18342,5 +18394,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr "Επεξεργασία Συναλλακτηρίου"
@@ -18348,15 +18400,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "Επεξεργασία ΑΤΜ"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "Υγεία"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr "Ιατροί"
@@ -18364,20 +18416,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr "Επεξεργασία Ιατρών"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr "Οδοντίατρος"
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr "Επεξεργασία Οδοντιάτρου"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "Φαρμακείο"
@@ -18385,5 +18437,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "Επεξεργασία Φαρμακείου"
@@ -18391,10 +18443,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "Νοσοκομείο"
@@ -18402,10 +18454,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "Επεξεργασία Νοσοκομειου"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr ""
@@ -18414,5 +18466,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -18421,20 +18473,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr "Αριθμός Σημείου"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr "Όνομα Σημείου"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr "Αριθμός Τηλεφώνου"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Χρησιμοποιήστε διεθνή κωδικό, όπως +12-345-67890)"
@@ -18442,5 +18494,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr "Κτηνιατρίο"
@@ -18449,56 +18501,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr "Επεξεργασία Κτηνιατρίου"
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr "Ήπειρος"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr "Επεξεργασία Ηπείρου"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr "Χώρα"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr "Επεξεργασία Χώρας"
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr "Πολιτεία"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr "Επεξεργασία Πολιτείας"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr "Περιοχή"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr "Επεξεργασία Περιοχής"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr "Περιφέρεια"
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr "Επεξεργασία Περιφέρειας"
@@ -18506,15 +18557,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr "Πόλη"
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr "Επεξεργασία Πόλης"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr "Κωμόπολη"
@@ -18522,10 +18573,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr "Επεξεργασία Κωμόπολης"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr "Προάστιο"
@@ -18533,25 +18584,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr "Επεξεργασία Προαστίου"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "Χωριό"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "Επεξεργασία Χωριού"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr ""
@@ -18559,5 +18610,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr ""
@@ -18565,10 +18616,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "Νησί"
@@ -18576,5 +18627,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "Επεξεργασία Νησιού"
@@ -18582,5 +18633,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr "Είσοδος σπηλαίου"
@@ -18588,10 +18639,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr "Επεξεργασία εισόδου σπηλαίου"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "Κορυφή"
@@ -18599,10 +18650,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "Επεξεργασία κορυφής"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr "Παγετώνας"
@@ -18610,10 +18661,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr "Επεξεργασία παγετώνα"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr "Ηφαίστειο"
@@ -18621,70 +18672,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr "Επεξεργασία ηφαιστείου"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr "Όρια"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr "Εθνικό"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr "Επεξεργασία Εθνικού Συνόρου"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr "Διοικητικό"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr "Επεξεργασία Διοικητικού Ορίου"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr "Πολιτικό"
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr "Επεξεργασία Πολιτικού Ορίου"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr "Πολιτικό"
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr "Επεξεργασία Πολιτικού Ορίου"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr "Εθνικό πάρκο"
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr "Επεξεργασία Ορίου Εθνικού Δρυμού"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr "Χρήση γής"
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "Δένδρο"
@@ -18693,15 +18744,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "Επεξεργασία δένδρου"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr "Βοτανικό όνομα"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr "Άλσος"
@@ -18710,5 +18761,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr "Επεξεργασία άλσους"
@@ -18716,17 +18767,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr "Κωνοφόρο"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr "φυλλοβόλα"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr "Μικτό"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "Δάσος"
@@ -18735,14 +18786,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr "Επεξεργασία Δάσους"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -18750,25 +18801,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr ""
@@ -18776,10 +18827,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr ""
@@ -18787,5 +18838,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr ""
@@ -18793,5 +18844,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr ""
@@ -18800,45 +18851,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr "Χωράφι"
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr "Επεξεργασία Χωραφιού"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr "Αμπελώνας"
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr "Επεξεργασία Αμπελώνα"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr "Κλήροι"
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -18846,25 +18897,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr "Κήπος"
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr "Επεξεργασία Κήπου"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr "Γρασίδι"
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr ""
@@ -18872,10 +18923,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr ""
@@ -18883,20 +18934,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr "Πάρκο"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr "Επεξεργασία Πάρκου"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr "Χώρος αναψυχής"
@@ -18904,5 +18955,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr "Επεξεργασία χώρου αναψυχής"
@@ -18910,15 +18961,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr "Οικιστική περιοχή"
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr "Επεξεργασία οικιστικής περιοχής"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr "Νεκροταφείο"
@@ -18926,9 +18977,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr "Επεξεργασία Νεκροταφείου"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr "Κοιμητήριο"
@@ -18936,39 +18987,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr "Επεξεργασία χρήσης γης κοιμητηρίου"
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr "Βιομηχανική"
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr ""
@@ -18976,15 +19027,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr "Στρατιωτικά"
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr ""
@@ -18992,55 +19043,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr "Εγοτάξιο"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr "Επεξεργασία εργοταξίου"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr "ΧΥΤΑ"
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr "Επεξεργασία Χρήσης γης ΧΥΤΑ"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr "Λατομείο"
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr "Επεξεργασία Λατομείου"
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr ""
@@ -19050,5 +19101,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr ""
@@ -19057,10 +19108,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr ""
@@ -19068,5 +19119,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr "Περιορισμός στροφής"
@@ -19075,5 +19126,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr "Επεξεργασία περιορισμού στροφής"
@@ -19081,34 +19132,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr "Περιορισμός"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr "όχι_αριστερή_στροφή"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr "όχι_δεξιά_στροφή"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr "όχι_ευθεία"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr "όχι_αναστροφή"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr "μόνο_δεξιά_στροφή"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr "μόνο_αριστερή_στροφή"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr "μόνο_ευθεία"
@@ -19117,15 +19168,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr ""
@@ -19133,5 +19184,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr "Διαδρομή"
@@ -19140,5 +19191,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr "Επεξεργασία Διαδρομής"
@@ -19146,5 +19197,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr "Τύπος Διαδρομής"
@@ -19216,24 +19267,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr "ποδήλατο"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr "λεωφορείο"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr "δρόμος"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr "σκι"
@@ -19286,20 +19337,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr "πεζοπορία"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr "τραμ"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr "παράκαμψη"
@@ -19313,10 +19364,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr "υπόγειος"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr "Περιγραφή συμβόλου"
@@ -19324,26 +19375,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr "Δίκτυο"
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "Τύπος Διαδρομής"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr "προτεινόμενο"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr "εναλλακτικό"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr "προσωρινό"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr "σύνδεση"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr "Χρώμα (δεκαεξαδικό)"
@@ -19352,30 +19409,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr "τμήμα διαδρομής"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr ""
@@ -19411,6 +19468,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19426,5 +19484,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19443,5 +19509,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr ""
@@ -19535,7 +19601,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr "γέφυρα"
@@ -19800,15 +19866,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr ""
@@ -19850,5 +19916,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr "άλογο"
@@ -19986,4 +20052,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19995,5 +20067,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20001,5 +20073,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20036,5 +20108,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20058,11 +20130,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr ""
@@ -20086,5 +20158,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20125,5 +20197,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20161,6 +20233,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr "οδός"
@@ -20216,7 +20288,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr ""
@@ -20269,11 +20341,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr ""
@@ -20294,5 +20374,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr ""
@@ -20306,5 +20386,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr ""
@@ -20325,5 +20405,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr ""
@@ -20337,6 +20417,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr ""
@@ -20351,5 +20431,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr "όχθη ποταμού"
@@ -20363,5 +20443,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr "υδατόρρευμα"
@@ -20375,5 +20455,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr "προβλήτα"
@@ -20401,5 +20481,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr "υδαταγωγός"
@@ -20542,5 +20622,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20567,13 +20647,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr ""
@@ -20635,7 +20715,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr ""
@@ -20658,10 +20738,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr ""
@@ -20697,7 +20777,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr ""
@@ -20742,6 +20822,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr ""
@@ -20755,5 +20835,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr ""
@@ -20775,5 +20855,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr ""
@@ -20787,5 +20867,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr ""
@@ -20793,4 +20873,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20833,7 +20920,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr ""
@@ -20850,5 +20937,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr "πίστα εύκολη"
@@ -20863,5 +20950,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr "πίστα μεσαία"
@@ -20876,5 +20963,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr "πίστα προχορημένη"
@@ -20889,5 +20976,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr ""
@@ -20902,5 +20989,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr ""
@@ -20915,5 +21002,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr "πιστα αρχαρίων"
@@ -20936,4 +21023,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -20944,4 +21038,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -21018,10 +21120,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr ""
@@ -21035,5 +21138,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr "προβλήτα"
@@ -21047,5 +21150,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr "αγωγός"
@@ -21173,12 +21276,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr "αναψυχή"
@@ -21192,5 +21295,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr ""
@@ -21262,8 +21365,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr ""
@@ -21365,10 +21468,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr ""
@@ -21388,4 +21491,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21407,4 +21517,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21728,4 +21845,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -21752,24 +21877,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr ""
@@ -21801,6 +21934,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr ""
@@ -21861,8 +21994,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr "υγεία"
@@ -22215,26 +22348,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr "κατάστημα"
@@ -22289,5 +22422,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22306,8 +22439,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr "ξενοδοχείο"
@@ -22457,9 +22590,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr "τουρισμός"
@@ -22531,8 +22664,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr "ιστορικό"
@@ -22603,8 +22736,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr ""
@@ -22618,5 +22751,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr "λατομείο"
@@ -22630,5 +22763,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr "Χ.Υ.Τ.Α."
@@ -22650,5 +22783,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr "λεκάνη"
@@ -22662,5 +22795,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr "δάσος"
@@ -22674,5 +22807,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr ""
@@ -22695,5 +22828,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr ""
@@ -22707,5 +22840,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr "βιομηχανική"
@@ -22719,5 +22852,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr ""
@@ -22731,5 +22864,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr ""
@@ -22743,5 +22876,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr ""
@@ -22798,7 +22931,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr "στρατιωτική"
@@ -22812,5 +22945,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr "κοιμητήριο"
@@ -22823,5 +22956,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr "κορυφή"
@@ -22836,5 +22969,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr "παγετώνας"
@@ -22848,5 +22981,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr "ηφαίστειο"
@@ -22901,8 +23034,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr ""
@@ -22916,5 +23049,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr ""
@@ -22928,5 +23061,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr ""
@@ -22940,5 +23073,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr "άλσος"
@@ -22952,5 +23085,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr "λάσπη"
@@ -22964,5 +23097,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr "παραλία"
@@ -23040,8 +23173,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr "διαδρομή"
@@ -23089,7 +23222,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr "όριο"
@@ -23231,10 +23364,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr ""
@@ -23282,6 +23415,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr "διεύθυνση"
@@ -23578,19 +23711,4 @@
 msgstr "Terraserver Urban"
 
-#~ msgid "Unknown file extension."
-#~ msgstr "Άγνωστη επέκταση αρχείου."
-
-#~ msgid "Move"
-#~ msgstr "Μετακίνηση"
-
-#~ msgid "Invalid projection"
-#~ msgstr "Άκυρη προβολή"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Αλλάξτε την προβολή σε {0} πρώτα."
-
-#~ msgid "end"
-#~ msgstr "τέλος"
-
 #~ msgid ""
 #~ "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -23626,6 +23744,12 @@
 #~ msgstr "EPSG:4326"
 
+#~ msgid "Move"
+#~ msgstr "Μετακίνηση"
+
 #~ msgid "unnamed"
 #~ msgstr "χωρίς όνομα"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Άγνωστη επέκταση αρχείου."
 
 #~ msgid "Contacting the OSM server..."
@@ -23850,4 +23974,10 @@
 #~ msgstr "Διαγραφή και Λήψη"
 
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Αλλάξτε την προβολή σε {0} πρώτα."
+
+#~ msgid "Invalid projection"
+#~ msgstr "Άκυρη προβολή"
+
 #~ msgid "Open the OpenStreetBugs window and activate the automatic download"
 #~ msgstr ""
@@ -23856,4 +23986,7 @@
 #~ msgid "Import TCX file as GPS track"
 #~ msgstr "Εισαγωγή αρχείου TCX ως ίχνος GPS"
+
+#~ msgid "end"
+#~ msgstr "τέλος"
 
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
Index: /applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- /applications/editors/josm/i18n/po/en_GB.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/en_GB.po	(revision 17069)
@@ -10,7 +10,7 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
-"PO-Revision-Date: 2009-08-04 10:57+0000\n"
-"Last-Translator: Michael Keppler <Bananeweizen@gmx.de>\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
+"PO-Revision-Date: 2009-08-14 08:12+0000\n"
+"Last-Translator: nin2jardin <Unknown>\n"
 "Language-Team: British English <en@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,5 +18,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-10 11:58+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -58,6 +58,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -102,6 +102,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "Error"
@@ -112,5 +112,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "Unsaved Changes"
@@ -130,10 +130,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -150,15 +150,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -188,6 +188,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -217,5 +217,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -327,5 +327,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
 msgid "License"
-msgstr ""
+msgstr "License"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
@@ -367,15 +367,15 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Please select the target layer."
-msgstr ""
+msgstr "Please select the target layer."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 msgid "Select target layer"
-msgstr ""
+msgstr "Select target layer"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
-msgstr ""
+msgstr "Merge"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -385,8 +385,10 @@
 "</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:86
 msgid "No target layers"
-msgstr ""
+msgstr "No target layers"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
@@ -457,9 +459,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -492,7 +494,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -579,37 +581,37 @@
 msgstr "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "layer"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "selection"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "conflict"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "download"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zoom to {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zoom the view to {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -619,30 +621,30 @@
 msgstr "View: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "Nothing selected to zoom to."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "No conflicts to zoom to"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "Combine Way"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "Combine several ways into one."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "Please select at least two ways to combine."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr "Combine ways with different memberships?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -652,13 +654,13 @@
 "combine them?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "Combine Anyway"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "Change directions?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -668,10 +670,10 @@
 "reverse some of them?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "Reverse and Combine"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -679,20 +681,20 @@
 msgstr "Enter values for all conflicts."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Solve Conflicts"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combine {0} ways"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "All the ways were empty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -727,5 +729,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr ""
+msgstr "Those nodes are not in a circle. Aborting."
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -741,6 +743,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -762,6 +764,6 @@
 msgstr "Delete selected objects."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -771,5 +773,5 @@
 msgstr "Overwrite"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -818,13 +820,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download referrers from OSM..."
-msgstr ""
+msgstr "Download referrers from OSM..."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download primitives referring to one of the selected primitives"
-msgstr ""
+msgstr "Download primitives referring to one of the selected primitives"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42
 msgid "Download referrers..."
-msgstr ""
+msgstr "Download referrers..."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
@@ -840,10 +842,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
 msgid "Conflicts during download"
-msgstr ""
+msgstr "Conflicts during download"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
 #, java-format
 msgid "({0}/{1}) Loading parents of primitive {2}"
-msgstr ""
+msgstr "({0}/{1}) Loading parents of primitive {2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
@@ -898,10 +900,9 @@
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-msgstr ""
+msgstr "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "Export the data to GPX file."
+msgstr "Export GPX file"
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -917,5 +918,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -933,5 +934,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -999,28 +1000,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
 msgid "Merge layer"
-msgstr ""
+msgstr "Merge layer"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
 msgid "Merge the current layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+msgstr "Merge the current layer into another layer"
+
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "Merge Nodes"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "Merge nodes into the oldest one."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "Please select at least two nodes to merge."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr "Merge nodes with different memberships?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1030,13 +1031,13 @@
 "to merge them?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "Merge Anyway"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "Cannot merge nodes: Would have to delete a way that is still used."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1046,9 +1047,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 msgid "Merge selection"
-msgstr ""
+msgstr "Merge selection"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 msgid "Merge the currently selected primitives into another layer"
-msgstr ""
+msgstr "Merge the currently selected primitives into another layer"
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1128,5 +1129,5 @@
 #, java-format
 msgid "<html>Could not read file ''{0}''. Error is: <br>{1}</html>"
-msgstr ""
+msgstr "<html>Could not read file ''{0}''. Error is: <br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
@@ -1186,4 +1187,7 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 msgstr ""
+"<html>You are using the EPSG:4326 projection which might lead<br>to "
+"undesirable results when doing rectangular alignments.<br>Change your "
+"projection to get rid of this warning.<br>Do you want to continue?</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
@@ -1249,10 +1253,10 @@
 #, java-format
 msgid "Warning: failed to put a dialog always on top. Exception was: {0}"
-msgstr ""
+msgstr "Warning: failed to put a dialog always on top. Exception was: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
 #, java-format
 msgid "Could not rename file ''{0}''"
-msgstr ""
+msgstr "Could not rename file ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1290,7 +1294,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "No intersection found. Nothing was changed."
+msgstr "No Exporter found! Nothing saved."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1461,4 +1464,6 @@
 "should verify this and correct it when necessary.</html>"
 msgstr ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
@@ -1467,4 +1472,6 @@
 "this and correct it when necessary.</html>"
 msgstr ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
@@ -1606,9 +1613,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
 msgid "No current dataset found"
-msgstr ""
+msgstr "No current dataset found"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
 msgid "Didn't find a primitive with id {0} in the current dataset"
-msgstr ""
+msgstr "Didn't find a primitive with id {0} in the current dataset"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
@@ -1729,5 +1736,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
 msgid "upload all changes in one request"
-msgstr ""
+msgstr "upload all changes in one request"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -1736,4 +1743,6 @@
 "changed primitive"
 msgstr ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464
@@ -1870,4 +1879,5 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr ""
+"Ignoring exception because download has been cancelled. Exception was: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
@@ -1886,10 +1896,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
 msgid "Updating data"
-msgstr ""
+msgstr "Updating data"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
 #, java-format
 msgid "The following errors occurred during mass download:{0}"
-msgstr ""
+msgstr "The following errors occurred during mass download:{0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
@@ -1897,5 +1907,5 @@
 msgstr "Errors during Download"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1912,5 +1922,5 @@
 "</strong> to ignore.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr "Deleted or moved primitives"
@@ -1949,11 +1959,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2093,5 +2103,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2170,5 +2180,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Search for objects."
@@ -2176,5 +2186,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
-msgstr ""
+msgstr "Can't search because there is no loaded data."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66
@@ -2297,5 +2307,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Search"
@@ -2478,9 +2488,11 @@
 "conflict can't be added.</html>"
 msgstr ""
+"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''.<br>This "
+"conflict can't be added.</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr ""
+msgstr "Double conflict"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
@@ -2490,13 +2502,15 @@
 "primitmive ''{1}''"
 msgstr ""
+"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for "
+"primitmive ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
 #, java-format
 msgid "Add conflict for ''{0}''"
-msgstr ""
+msgstr "Add conflict for ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2540,5 +2554,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr "Delete from relation"
@@ -2572,5 +2586,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr ""
+msgstr "Delete confirmation"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2580,9 +2594,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "Merge {0} nodes"
-msgstr[1] "Merge {0} nodes"
+msgstr[0] "Move {0} node"
+msgstr[1] "Move {0} nodes"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2620,9 +2634,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "Rotate {0} {1}"
-msgstr[1] "Rotate {0} {1}"
+msgstr[0] "Rotate {0} node"
+msgstr[1] "Rotate {0} nodes"
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2755,4 +2769,6 @@
 "{1}"
 msgstr ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
 
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
@@ -2786,7 +2802,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "Change {0} {1}"
+msgstr "Changeset {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2796,5 +2812,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2841,5 +2857,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2872,5 +2888,5 @@
 msgstr "parameter ''{0}'' is not an acceptable class, got ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2884,5 +2900,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "railway"
@@ -2897,5 +2913,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3115,9 +3131,9 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
-msgstr ""
+msgstr "WGS84 Geographic"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
 msgid "Gauss-Laborde Réunion 1947"
-msgstr ""
+msgstr "Gauss-Laborde Réunion 1947"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111
@@ -3158,23 +3174,23 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
 msgid "UTM20N Guadeloupe Fort-Marigot 1949"
-msgstr ""
+msgstr "UTM20N Guadeloupe Fort-Marigot 1949"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
 msgid "UTM20N Guadeloupe Ste-Anne 1948"
-msgstr ""
+msgstr "UTM20N Guadeloupe Ste-Anne 1948"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
 msgid "UTM20N Martinique Fort Desaix 1952"
-msgstr ""
+msgstr "UTM20N Martinique Fort Desaix 1952"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
 #, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr ""
+msgstr "<html>Could not read bookmarks.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr ""
+msgstr "<html>Could not write bookmark.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3182,5 +3198,5 @@
 msgstr "Do not show again"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3191,5 +3207,5 @@
 "Check the server URL in your preferences and your internet connection."
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3202,10 +3218,10 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr "Precondition violation"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3213,25 +3229,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "unknown"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3240,10 +3256,13 @@
 "applet and because you didn''t load your applet from ''{1}''.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+"<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
+"security reasons. This is most likely because you are running<br>in an "
+"applet and because you didn''t load your applet from ''{1}''.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+msgstr "Security exception"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3251,10 +3270,24 @@
 "check your internet connection.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
+"check your internet connection.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
+msgstr "Network exception"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "Unexpected Exception"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3263,10 +3296,13 @@
 "preferences and your internet connection.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
+"name ''{1}'' couldn''t be resolved. <br>Please check the API URL in your "
+"preferences and your internet connection.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "Unknown host"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3279,5 +3315,5 @@
 "<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr "Primitive already deleted"
@@ -3286,5 +3322,5 @@
 #, java-format
 msgid "Warning: failed to bring extended dialog always on top. Exception: {0}"
-msgstr ""
+msgstr "Warning: failed to bring extended dialog always on top. Exception: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65
@@ -3367,10 +3403,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "Username"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "Password"
@@ -3574,19 +3610,20 @@
 msgstr "(no object)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "layer not in list."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+msgstr "Layer ''{0}'' must be in list of layers"
+
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
 "Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63
@@ -3596,4 +3633,6 @@
 "{0}"
 msgstr ""
+"Warning: failed to put ''please wait dialog'' always on top. Exception was: "
+"{0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
@@ -3637,5 +3676,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr "My with Their"
@@ -3644,5 +3683,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr "My with Merged"
@@ -3651,20 +3690,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr "Their with Merged"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr "role {0} is not participating in compare pair {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3674,6 +3713,6 @@
 msgstr "Tags"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3681,6 +3720,6 @@
 msgstr "Nodes"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3688,23 +3727,23 @@
 msgstr "Members"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr "No pending tag conflicts to be resolved"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "Tags({0} conflicts)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr "{0} pending tag conflicts to be resolved"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr "Nodes(resolved)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
@@ -3712,17 +3751,17 @@
 "Merged node list frozen. No pending conflicts in the node list of this way"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "Nodes(with conflicts)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr "Pending conflicts in the node list of this way"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "Members(resolved)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3732,74 +3771,74 @@
 "relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "Members(with conflicts)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr "Pending conflicts in the member list of this relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr "No pending property conflicts"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "Properties(with conflicts)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr "Pending property conflicts to be resolved"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "Conflict Resolution"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr "parameter current out of range: got {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr "list in role {0} is currently not participating in a compare pair"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr "unexpected value of parameter \"index\". Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr "item {0} not found in list"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr "lock scrolling"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr "Compare "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr "My version"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr "List of elements in my dataset, i.e. the local dataset"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr "Merged version"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3809,30 +3848,30 @@
 "decisions are applied."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr "Their version"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr "List of elements in their dataset, i.e. the server dataset"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr "> top"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr "Copy my selected nodes to the start of the merged node list"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr "> bottom"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr "Copy my selected elements to the end of the list of merged elements"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3842,5 +3881,5 @@
 "merged elements"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3850,14 +3889,14 @@
 "merged elements"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
 "Copy their selected element to the start of the list of merged elements"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 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/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3867,5 +3906,5 @@
 "of merged elements"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3875,21 +3914,21 @@
 "merged elements"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr "Up"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr "Move up the selected elements by one position"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr "Down"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr "Move down the selected entries by one position"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3898,27 +3937,27 @@
 msgstr "Remove"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr "Remove the selected entries from the list of merged elements"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr "Freeze"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr "Freeze the current list of merged elements"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr "Unfreeze"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr "Unfreeze the list of merged elements and start merging"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3927,5 +3966,5 @@
 "<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3936,5 +3975,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3943,5 +3982,5 @@
 msgstr[1] "My version ({0} entries)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3950,5 +3989,5 @@
 msgstr[1] "Merged version ({0} entries)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -3957,21 +3996,21 @@
 msgstr[1] "Their version ({0} entries)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -3981,5 +4020,5 @@
 msgstr "parameter '{0}' must not be null"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -3991,5 +4030,5 @@
 "adjustment"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -3997,19 +4036,19 @@
 msgstr "adjustable {0} not registered yet"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr "Node"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr "Merged nodes not frozen yet. Can't build resolution command"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr "unexpected column index. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -4020,19 +4059,19 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr "Communication with server failed"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr "Yes, undelete them too"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr "No, cancel operation"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -4043,9 +4082,9 @@
 "the server.<br><br>Do you want to undelete these nodes too?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr "Undelete additional nodes?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -4058,13 +4097,13 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr "Undelete dependent primitives?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr "Properties in my dataset, i.e. the local dataset"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -4074,90 +4113,90 @@
 "elements when merge decisions are applied."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr "Properties in their dataset, i.e. the server dataset"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr "Coordinates:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr "Deleted State:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr "Visible State:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr "(none)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "deleted"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr "not deleted"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr "visible (on the server)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr "not visible (on the server)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr "Keep a clone of the local version"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr "Physically delete from local dataset"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr "Keep my coordiates"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr "Keep their coordiates"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr "Undecide conflict between different coordinates"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr "Keep my deleted state"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr "Keep their deleted state"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr "Undecide conflict between deleted state"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr "Keep my visible state"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr "Yes, reset the id"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr "No, abort"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4170,17 +4209,17 @@
 "agree?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr "Reset id to 0"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr "Keep their visible state"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr "Yes, purge it"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4191,14 +4230,14 @@
 "dataset.<br>Do you agree?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr "Remove from dataset"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr "Undecide conflict between visible state"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4206,21 +4245,21 @@
 msgstr "Role"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr "Primitive"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr "merged nodes not frozen yet. Can't build resolution command"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4228,14 +4267,14 @@
 msgstr "<undefined>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr "The merged dataset will not include a tag with key {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4243,7 +4282,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4255,7 +4294,7 @@
 msgstr "Key"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4268,45 +4307,45 @@
 msgstr "Value"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr "cannot apply undecided tag merge item"
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr "Parameter 'col' must be 0 or 1. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr "My version (local dataset)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr "Their version (server dataset)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ">"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Keep the selected key/value pairs from the local dataset"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr "Keep the selected key/value pairs from the server dataset"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr "Undecide"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr "Mark the selected tags as undecided"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4326,8 +4365,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4364,5 +4403,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4376,4 +4415,6 @@
 "Exception: {0}"
 msgstr ""
+"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. "
+"Exception: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
@@ -4391,5 +4432,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
 msgid "Close anyway"
-msgstr ""
+msgstr "Close anyway"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4406,8 +4447,13 @@
 "<strong>{1}</strong> to return to resolving conflicts.</html>"
 msgstr ""
+"<html>You didn''t finish to merge the differences in this conflict."
+"<br>Conflict resolutions won't be applied unless all differences<br>are "
+"resolved.Click <strong>{0}</strong> to close anyway."
+"<strong>Already<br>resolved differences won't be applied.</strong><br>Click "
+"<strong>{1}</strong> to return to resolving conflicts.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:210
 msgid "Conflict not resolved completely"
-msgstr ""
+msgstr "Conflict not resolved completely"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:246
@@ -4418,5 +4464,5 @@
 #, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr ""
+msgstr "Resolve conflicts for ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4465,83 +4511,84 @@
 msgstr "Display the history of the selected primitive"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+msgstr "Dialog not created yet. Invoke createInstance() first"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "Layers"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "Open a list of all loaded layers."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "Delete the selected layer."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+"There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr "Delete Layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+msgstr "Do you really want to delete layer ''{0}''?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+msgstr "Confirmation"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+msgstr "Yes"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+msgstr "No"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+msgstr "Delete all"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+msgstr "Deleting layer {0} of {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "Show/Hide"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "Toggle visible state of the selected layer."
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr "Activate"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+msgstr "Activate the selected layer"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+msgstr "Merge this layer into another layer"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "Move the selected layer one row up."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "Move the selected layer one row down."
@@ -4549,8 +4596,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
 msgid "Information about layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+msgstr "Information about layer"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4559,28 +4606,29 @@
 msgstr[1] "This will change up to {0} objects."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "An empty value deletes the key."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<different>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "Change values?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
 "Warning: failed to put properties dialog always on top. Exception was: {0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+"Warning: failed to put properties dialog always on top. Exception was: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4589,40 +4637,40 @@
 msgstr[1] "Change properties of up to {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "Please select a key"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "Please select a value"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+msgstr "Warning: failed to put dialog always on top. Exception was: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 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/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "Properties/Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "Properties for selected objects."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "Member Of"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "Add Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4639,39 +4687,39 @@
 msgstr "Add"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 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/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "Edit Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 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/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Properties: {0} / Memberships: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "Properties / Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "Change relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Really delete selection from relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "Delete the selected key in all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "Delete Properties"
@@ -4683,5 +4731,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "Relations"
@@ -4711,33 +4759,33 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
 msgid "Create a copy of this relation and open it in another editor window"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+msgstr "Create a copy of this relation and open it in another editor window"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "Current Selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "Open a selection list window."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "Zoom to selected element(s)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "Refresh the selection list."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "Zoom to selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4745,5 +4793,5 @@
 msgstr "Selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4752,5 +4800,5 @@
 msgstr[1] "{0} ways"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4759,5 +4807,5 @@
 msgstr[1] "{0} relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -4771,5 +4819,5 @@
 #, java-format
 msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}"
-msgstr ""
+msgstr "Warning: failed to put toggle dialog always on top. Exception was: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215
@@ -4809,21 +4857,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
 msgid "Edit the relation the currently selected relation member refers to"
-msgstr ""
+msgstr "Edit the relation the currently selected relation member refers to"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222
 msgid "Download all child relations (recursively)"
-msgstr ""
+msgstr "Download all child relations (recursively)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
 msgid "Download All Children"
-msgstr ""
+msgstr "Download All Children"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
 msgid "Download selected relations"
-msgstr ""
+msgstr "Download selected relations"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
 msgid "Download Selected Children"
-msgstr ""
+msgstr "Download Selected Children"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
@@ -4844,8 +4892,10 @@
 "loaded"
 msgstr ""
+"<html>The child relation<br>{0}<br>is deleted on the server. It can't be "
+"loaded"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
 msgid "Relation is deleted"
-msgstr ""
+msgstr "Relation is deleted"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
@@ -4853,5 +4903,5 @@
 #, java-format
 msgid "Downloading relation {0}"
-msgstr ""
+msgstr "Downloading relation {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
@@ -4865,14 +4915,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
 msgid "Tags and Members"
-msgstr ""
+msgstr "Tags and Members"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172
 msgid "Parent Relations"
-msgstr ""
+msgstr "Parent Relations"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
 msgid "Child Relations"
-msgstr ""
+msgstr "Child Relations"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -4881,9 +4931,10 @@
 "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}"
 msgstr ""
+"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}"
 
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Role:"
-msgstr ""
+msgstr "Role:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
@@ -4893,13 +4944,16 @@
 "<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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr ""
+msgstr "Remove them, clean up relation"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
-msgstr ""
+msgstr "Ignore them, leave relation as is"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
@@ -4910,8 +4964,11 @@
 "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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
-msgstr ""
+msgstr "Multiple members referring to same primitive"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
@@ -4922,4 +4979,7 @@
 "''{0}''.</html>"
 msgstr ""
+"<html>You are trying to add a relation to itself.<br><br>This creates "
+"circular references and is therefore discouraged.<br>Skipping relation "
+"''{0}''.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
@@ -4927,4 +4987,5 @@
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
+"Add all primitives selected in the current dataset before the first member"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
@@ -4932,4 +4993,5 @@
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
+"Add all primitives selected in the current dataset after the last member"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
@@ -4938,4 +5000,6 @@
 "member"
 msgstr ""
+"Add all primitives selected in the current dataset before the first selected "
+"member"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
@@ -4944,13 +5008,15 @@
 "member"
 msgstr ""
+"Add all primitives selected in the current dataset after the last selected "
+"member"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Remove all members referring to one of the selected primitives"
-msgstr ""
+msgstr "Remove all members referring to one of the selected primitives"
 
 #. putValue(NAME, tr("Remove Selected"));
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
 msgid "Relation Editor: Remove Selected"
-msgstr ""
+msgstr "Relation Editor: Remove Selected"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
@@ -4959,4 +5025,5 @@
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
+"Select relation members which refer to primitives in the current selection"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
@@ -4966,18 +5033,19 @@
 "selection"
 msgstr ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "Delete the selected relation"
+msgstr "Select primitives for selected relation members"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
 msgid "Sort the relation members"
-msgstr ""
+msgstr "Sort the relation members"
 
 #. putValue(NAME, tr("Sort"));
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
 msgid "Relation Editor: Sort"
-msgstr ""
+msgstr "Relation Editor: Sort"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
@@ -4988,5 +5056,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
 msgid "Relation Editor: Move Up"
-msgstr ""
+msgstr "Relation Editor: Move Up"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
@@ -4997,26 +5065,26 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid "Relation Editor: Move Down"
-msgstr ""
+msgstr "Relation Editor: Move Down"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr ""
+msgstr "Remove the currently selected members from this relation"
 
 #. putValue(NAME, tr("Remove"));
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Relation Editor: Remove"
-msgstr ""
+msgstr "Relation Editor: Remove"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr ""
+msgstr "Delete the currently edited relation"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
-msgstr ""
+msgstr "Yes, create a conflict and close"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
-msgstr ""
+msgstr "No, continue editing"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
@@ -5026,8 +5094,11 @@
 "conflict and close the editor?</html>"
 msgstr ""
+"<html>This relation has been changed outside of the editor.<br>You can't "
+"apply your changes and continue editing.<br><br>Do you want to create a "
+"conflict and close the editor?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr ""
+msgstr "Conflict in data"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
@@ -5037,19 +5108,21 @@
 "<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:1188
 msgid "Apply the current updates"
-msgstr ""
+msgstr "Apply the current updates"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Apply"
-msgstr ""
+msgstr "Apply"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
-msgstr ""
+msgstr "Apply the updates and close the dialog"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5063,13 +5136,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
 msgid "Cancel the updates and close the dialog"
-msgstr ""
+msgstr "Cancel the updates and close the dialog"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
 msgid "Add an empty tag"
-msgstr ""
+msgstr "Add an empty tag"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Delete the currently selected tags"
-msgstr ""
+msgstr "Delete the currently selected tags"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
@@ -5083,13 +5156,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
 msgid "Relation Editor: Download Members"
-msgstr ""
+msgstr "Relation Editor: Download Members"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Sets a role for the selected members"
-msgstr ""
+msgstr "Sets a role for the selected members"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Apply Role"
-msgstr ""
+msgstr "Apply Role"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
@@ -5100,62 +5173,65 @@
 "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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
-msgstr ""
+msgstr "Yes, apply it"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
-msgstr ""
+msgstr "No, don't apply"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
-msgstr ""
+msgstr "Confirm empty role"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
 msgid "Zoom to"
-msgstr ""
+msgstr "Zoom to"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
 msgid "Zoom to primitive the first selected member refers to"
-msgstr ""
+msgstr "Zoom to primitive the first selected member refers to"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
 msgid "Zooming disabled because layer of this relation is not active"
-msgstr ""
+msgstr "Zooming disabled because layer of this relation is not active"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225
 msgid "Zooming disabled because there is no selected member"
-msgstr ""
+msgstr "Zooming disabled because there is no selected member"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24
 msgid "Refers to"
-msgstr ""
+msgstr "Refers to"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32
 msgid "Linked"
-msgstr ""
+msgstr "Linked"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
 msgid "Download referring relations"
-msgstr ""
+msgstr "Download referring relations"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
 #, java-format
 msgid "child.id >0 expected. Got {1}"
-msgstr ""
+msgstr "child.id >0 expected. Got {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78
 msgid "including immediate children of parent relations"
-msgstr ""
+msgstr "including immediate children of parent relations"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
 msgid "Load parent relations"
-msgstr ""
+msgstr "Load parent relations"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157
 msgid "Edit the currently selected relation"
-msgstr ""
+msgstr "Edit the currently selected relation"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
@@ -5180,9 +5256,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
 msgid "Load relation"
-msgstr ""
+msgstr "Load relation"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
 msgid "Warning: ignoring exception because task was cancelled. Exception was: "
 msgstr ""
+"Warning: ignoring exception because task was cancelled. Exception was: "
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70
@@ -5213,5 +5290,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 msgid "Name of location"
-msgstr ""
+msgstr "Name of location"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -5290,5 +5367,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "Places"
@@ -5335,21 +5412,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "type"
@@ -5410,4 +5487,5 @@
 "Warning: failed to put history browser always on top. Exception was: {0}"
 msgstr ""
+"Warning: failed to put history browser always on top. Exception was: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121
@@ -6153,72 +6231,517 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "Name"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr "Version {0} created on {1} by {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr "Version"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr "Images for {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr "Read GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "No time for point {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Cannot read time \"{0}\" from point {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr "No images with readable timestamps found."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "Reading {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr "Geotagged Images"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS start: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS end: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr "current delta: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr "timezone difference: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "image"
+msgstr[1] "images"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} within the track."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "Sync clock"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG images (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "The date in file \"{0}\" could not be parsed."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "There is no EXIF time within the file \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "Image"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr "GPS unit timezone (difference to photo)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr "Synchronise Time with GPS Unit"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr "Time entered could not be parsed."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr "gps point"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "Customise line drawing"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr "Use global settings."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr "Draw lines between points for this layer."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr "Do not draw lines between points for this layer."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr "Select line drawing options"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "Customise Colour"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Default"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Choose a colour"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr "Markers From Named Points"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Named Trackpoints from {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "Import Audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave Audio files (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Audio markers from {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "Import images"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} track, "
+msgstr[1] "{0} tracks, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} route, "
+msgstr[1] "{0} routes, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} waypoint"
+msgstr[1] "{0} waypoints"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr "Name: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr "Description: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr "Timespan: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr "Length: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "Convert to data layer"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+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:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Converted from: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr "Download from OSM along this track"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr "Download everything within:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr "{0} metres"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr "Maximum area per request:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} sq km"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr "No GPX track available in layer to associate audio with."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Data Layer {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr "outside downloaded area"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr "version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} consists of:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} deleted.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr "unset"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr "API version: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr "Convert to GPX layer"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6227,7 +6750,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6237,450 +6760,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "Name"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr "Version {0} created on {1} by {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr "Version"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr "Images for {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr "Read GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "No time for point {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Cannot read time \"{0}\" from point {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr "No images with readable timestamps found."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Reading {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr "Geotagged Images"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS start: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS end: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr "current delta: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr "timezone difference: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "image"
-msgstr[1] "images"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} within the track."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "Sync clock"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG images (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "The date in file \"{0}\" could not be parsed."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "There is no EXIF time within the file \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "Image"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr "GPS unit timezone (difference to photo)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr "Synchronise Time with GPS Unit"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr "Time entered could not be parsed."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr "gps point"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "Customise line drawing"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "Use global settings."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr "Draw lines between points for this layer."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr "Do not draw lines between points for this layer."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr "Select line drawing options"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "Customise Colour"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Default"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Choose a colour"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr "Markers From Named Points"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Named Trackpoints from {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "Import Audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave Audio files (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Audio markers from {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "Import images"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} track, "
-msgstr[1] "{0} tracks, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} route, "
-msgstr[1] "{0} routes, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} waypoint"
-msgstr[1] "{0} waypoints"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr "Name: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr "Description: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr "Timespan: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr "Length: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "Convert to data layer"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-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:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Converted from: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr "Download from OSM along this track"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr "Download everything within:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr "{0} metres"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr "Maximum area per request:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} sq km"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr "No GPX track available in layer to associate audio with."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Data Layer {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr "outside downloaded area"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr "version {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} consists of:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} deleted.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr "unset"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr "API version: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr "Convert to GPX layer"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -7071,5 +7149,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "Car"
@@ -7086,16 +7164,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "Bicycle"
@@ -7123,14 +7203,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "Foot"
@@ -7348,19 +7431,19 @@
 msgstr "Language"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr "Enable built-in defaults"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr "Enable built-in icon defaults"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr "Map Paint Styles"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr "Used style"
@@ -7391,5 +7474,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93
 msgid "Enter URL"
-msgstr ""
+msgstr "Enter URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
@@ -7404,5 +7487,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115
 msgid "JOSM Plugin description URL"
-msgstr ""
+msgstr "JOSM Plugin description URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142
@@ -7491,39 +7574,11 @@
 msgstr "Proxy server password"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr "The base URL for the OSM server (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr "Login name (e-mail) to the OSM account."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Login password to the OSM account. Leave blank to not store any password."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "Base Server URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr "OSM username (e-mail)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "OSM password"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -7897,7 +7952,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "Could not read \"{0}\""
+msgstr "Could not export \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -8002,7 +8057,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "Unknown role ''{0}''."
+msgstr "Unknown mode {0}."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8023,5 +8078,5 @@
 #, java-format
 msgid "Fetching {0} with id {1} from ''{2}''"
-msgstr ""
+msgstr "Fetching {0} with id {1} from ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:371
@@ -8033,5 +8088,5 @@
 #, java-format
 msgid "Fetching a package of {0} from ''{1}''"
-msgstr ""
+msgstr "Fetching a package of {0} from ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408
@@ -8133,14 +8188,14 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361
 msgid "Waiting 10 seconds ... "
-msgstr ""
+msgstr "Waiting 10 seconds ... "
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369
 msgid "OK - trying again."
-msgstr ""
+msgstr "OK - trying again."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
 #, java-format
 msgid "Starting retry {0} of {1}."
-msgstr ""
+msgstr "Starting retry {0} of {1}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -8165,23 +8220,51 @@
 msgstr "Invalid bz2 file."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "Incorrect password or username."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Warning: The password is transferred unencrypted."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "Save user and password (unencrypted)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
 msgstr "Login"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr "Login name (e-mail) to the OSM account."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr ""
+"Login password to the OSM account. Leave blank to not store any password."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr "OSM username (e-mail)"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "OSM password"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -8193,10 +8276,10 @@
 #, java-format
 msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-msgstr ""
+msgstr "Expected instance of OsmDataLayer. Got ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
 #, java-format
 msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
-msgstr ""
+msgstr "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
@@ -8206,9 +8289,11 @@
 "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
 #, java-format
 msgid "Could not back up file. Exception is: {0}"
-msgstr ""
+msgstr "Could not back up file. Exception is: {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
@@ -8268,5 +8353,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214
 msgid "Parsing OSM history data ..."
-msgstr ""
+msgstr "Parsing OSM history data ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38
@@ -8350,15 +8435,17 @@
 "missing in the loaded data and is therefore incomplete too"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+"marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "Unknown member type for ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr "Unknown relation member type {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "Prepare OSM data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr "Ill-formed node id"
@@ -8367,18 +8454,18 @@
 #, java-format
 msgid "id parameter ''{0}'' > 0 required. Got {1}"
-msgstr ""
+msgstr "id parameter ''{0}'' > 0 required. Got {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
 #, java-format
 msgid "parameter ''{0}'' > 0 required. Got {1}"
-msgstr ""
+msgstr "parameter ''{0}'' > 0 required. Got {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
-msgstr ""
+msgstr "Downloading referring ways ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181
 msgid "Downloading referring relations ..."
-msgstr ""
+msgstr "Downloading referring relations ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -8418,4 +8505,6 @@
 "Exception was: {1}"
 msgstr ""
+"Failed to close changeset {0}, will be closed by server after timeout. "
+"Exception was: {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:172
@@ -8487,4 +8576,5 @@
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
+"Loading of {0} plugin was requested. This plugin is no longer required."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
@@ -8572,9 +8662,9 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306
 msgid "The plugin could not be removed. Probably it was already disabled"
-msgstr ""
+msgstr "The plugin could not be removed. Probably it was already disabled"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
 msgid "Plugin information"
-msgstr ""
+msgstr "Plugin information"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -8601,5 +8691,5 @@
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
-msgstr ""
+msgstr "Plug-in named {0} is not available. Update skipped."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
@@ -8716,4 +8806,6 @@
 "was: {1}"
 msgstr ""
+"Warning: failed to acccess directory ''{0}'' for security reasons. Exception "
+"was: {1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201
@@ -8723,4 +8815,6 @@
 "problem. JOSM will stop working."
 msgstr ""
+"Fatal: failed to locate image ''{0}''. This is a serious configuration "
+"problem. JOSM will stop working."
 
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447
@@ -8761,5 +8855,5 @@
 #, java-format
 msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}"
-msgstr ""
+msgstr "Warning: failed to read MOTD from ''{0}''. Exception was: {1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61
@@ -8770,4 +8864,6 @@
 "was: {1}"
 msgstr ""
+"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception "
+"was: {1}"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
@@ -8815,5 +8911,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr "Description"
@@ -9231,5 +9327,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr "Error loading file"
@@ -9481,5 +9577,4 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
-#, fuzzy
 msgid ""
 "To enable the cadastre WMS plugin, change\n"
@@ -9488,5 +9583,6 @@
 msgstr ""
 "To enable the cadastre WMS plugin, change\n"
-"the JOSM projection to Lambert and restart"
+"the current projection to one of the cadastre\n"
+"projection and retry"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9578,5 +9674,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -10120,7 +10216,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr "water"
@@ -10300,7 +10396,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "name"
+msgstr "no name"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10864,12 +10959,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "start"
+msgstr "{0} start"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0} node"
+msgstr "{0} end"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -10900,9 +10995,10 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
 msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
+msgstr "INFO: entering compatibilty mode for JOSM with Main.ds"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
 msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
 msgstr ""
+"INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
@@ -10911,4 +11007,6 @@
 "found."
 msgstr ""
+"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
+"found."
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
@@ -11008,5 +11106,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr "Street name"
@@ -11836,7 +11934,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr "building"
@@ -11850,5 +11948,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr "area"
@@ -11946,5 +12044,5 @@
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
-msgstr ""
+msgstr "Scanned Map..."
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24
@@ -11952,4 +12050,5 @@
 "Display a map that was previously scanned and uploaded to walking-papers.org"
 msgstr ""
+"Display a map that was previously scanned and uploaded to walking-papers.org"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29
@@ -11957,14 +12056,15 @@
 "Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)"
 msgstr ""
+"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70
 #, java-format
 msgid "Could not read information from walking-papers.org the id \"{0}\""
-msgstr ""
+msgstr "Could not read information from walking-papers.org the id \"{0}\""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60
 #, java-format
 msgid "Walking Papers: {0}"
-msgstr ""
+msgstr "Walking Papers: {0}"
 
 #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67
@@ -12105,26 +12205,22 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "Please select the row to edit."
+msgstr "Please select the WMS layer to adjust."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "Save WMS layer"
+msgstr "Select WMS layer"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Start adjusting"
-msgstr "Start routing"
+msgstr "Start adjusting"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
 msgid "There are currently no WMS layer to adjust."
-msgstr ""
+msgstr "There are currently no WMS layer to adjust."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "No changes to upload."
+msgstr "No layers to adjust"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -12137,19 +12233,19 @@
 "This may lead to wrong coordinates."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr "Automatic downloading"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS layer ({0}), automatically downloading in zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS layer ({0}), downloading in zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -12157,42 +12253,42 @@
 "The requested area is too big. Please zoom in a little, or change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr "Download visible tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr "Change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr "Reload erroneous tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr "Save WMS layer to file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr "Save WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr "Load WMS layer from file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr "Load WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Unsupported WMS file version; found {0}, expected {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr "File Format Error"
@@ -12362,5 +12458,5 @@
 #: build/trans_plugins.java:23
 msgid "Visualizes routing information as a routing graph."
-msgstr ""
+msgstr "Visualizes routing information as a routing graph."
 
 #. Plugin grid
@@ -12539,4 +12635,6 @@
 "plugin is still under early development and may be buggy."
 msgstr ""
+"Supports downloading tiled, scanned maps from walking-papers.org. This "
+"plugin is still under early development and may be buggy."
 
 #. Plugin waydownloader
@@ -12564,4 +12662,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12598,5 +12698,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr "Streets"
@@ -12607,5 +12707,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Motorway"
@@ -12614,5 +12714,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr "Edit Motorway"
@@ -12639,8 +12739,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr "Reference"
@@ -12681,21 +12781,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr "Layer"
@@ -12709,8 +12809,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr "Lanes"
@@ -12728,15 +12828,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr "Max. speed (km/h)"
@@ -12773,16 +12873,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr "Oneway"
@@ -12824,19 +12924,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Bridge"
@@ -12872,19 +12972,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -12918,18 +13018,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr "Cutting"
@@ -12963,18 +13063,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr "Embankment"
@@ -12982,5 +13082,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr "Motorway Link"
@@ -12989,5 +13089,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr "Edit Motorway Link"
@@ -12995,5 +13095,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr "Trunk"
@@ -13002,5 +13102,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr "Edit Trunk"
@@ -13010,6 +13110,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr "Motorroad"
@@ -13017,5 +13117,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr "Trunk Link"
@@ -13024,5 +13124,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr "Edit Trunk Link"
@@ -13035,5 +13135,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Primary"
@@ -13042,5 +13142,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr "Edit Primary Road"
@@ -13048,10 +13148,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr "Primary Link"
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr "Edit Primary Link"
@@ -13063,5 +13163,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Secondary"
@@ -13071,5 +13171,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr "Edit Secondary Road"
@@ -13077,5 +13177,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr "Tertiary"
@@ -13085,5 +13185,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr "Edit Tertiary Road"
@@ -13095,5 +13195,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Unclassified"
@@ -13103,5 +13203,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr "Edit Unclassified Road"
@@ -13128,19 +13228,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr "Width (metres)"
@@ -13152,5 +13252,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Residential"
@@ -13159,5 +13259,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr "Edit Residential Street"
@@ -13181,13 +13281,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr "Surface"
@@ -13207,20 +13307,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr "paved"
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr "unpaved"
@@ -13228,12 +13328,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr "cobblestone"
@@ -13241,5 +13341,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr "Living Street"
@@ -13248,5 +13348,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr "Edit Living Street"
@@ -13254,5 +13354,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr "Service"
@@ -13261,5 +13361,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr "Edit Serviceway"
@@ -13269,18 +13369,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr "Serviceway type"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr "alley"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr "driveway"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr "parking_aisle"
@@ -13288,5 +13388,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr "Parking Aisle"
@@ -13296,5 +13396,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr "Edit Parking Aisle"
@@ -13302,5 +13402,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr "Road (Unknown Type)"
@@ -13309,5 +13409,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr "Edit Road of unknown type"
@@ -13316,20 +13416,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr "Road Restrictions"
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr "Edit Road Restrictions"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr "Toll"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr "No exit (cul-de-sac)"
@@ -13342,8 +13442,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr "Access"
@@ -13387,23 +13487,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr "yes"
@@ -13416,40 +13516,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr "private"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr "designated"
@@ -13462,19 +13562,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr "destination"
@@ -13497,65 +13597,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr "permissive"
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr "agricultural"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr "no"
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr "Goods"
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Heavy Goods Vehicles (hgv)"
@@ -13570,10 +13670,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr "Horse"
@@ -13589,13 +13689,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr "Motorcycle"
@@ -13611,30 +13711,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr "Motorcar"
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr "Public Service Vehicles (psv)"
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr "Motorboat"
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr "Boat"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr "Min. speed (km/h)"
@@ -13642,25 +13742,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr "Max. weight (tonnes)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr "Max. Height (metres)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr "Max. Width (metres)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr "Max. Length (metres)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr "Roundabout"
@@ -13671,5 +13771,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr "Edit Junction"
@@ -13691,9 +13791,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr "Type"
@@ -13713,10 +13813,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr "motorway"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr "motorway_link"
@@ -13738,10 +13838,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr "trunk"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr "trunk_link"
@@ -13763,10 +13863,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr "primary"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr "primary_link"
@@ -13788,6 +13888,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr "secondary"
@@ -13801,9 +13901,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr "tertiary"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr "unclassified"
@@ -13817,9 +13917,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr "residential"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr "living_street"
@@ -13849,10 +13949,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr "service"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr "bus_guideway"
@@ -13860,4 +13960,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13875,6 +13982,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr "construction"
@@ -13885,10 +13992,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr "Edit Bridge"
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr "Edit Tunnel"
@@ -13896,19 +14003,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr "Ways"
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr "Construction"
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr "Edit Highway Under Construction"
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr "Junction"
@@ -13924,5 +14031,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr "roundabout"
@@ -13931,5 +14038,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr "Bridleway"
@@ -13937,5 +14044,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr "Edit Bridleway"
@@ -13943,5 +14050,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr "Cycleway"
@@ -13951,5 +14058,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr "Edit Cycleway"
@@ -13957,5 +14064,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr "Footway"
@@ -13964,5 +14071,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr "Edit Footway"
@@ -13970,5 +14077,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr "Pedestrian"
@@ -13977,5 +14084,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr "Edit Pedestrian Street"
@@ -13983,5 +14090,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr "Steps"
@@ -13991,5 +14098,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr "Edit Flight of Steps"
@@ -13998,5 +14105,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr "Track"
@@ -14005,14 +14112,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr "Edit Track"
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr "concrete"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr "gravel"
@@ -14020,18 +14127,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr "ground"
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr "grass"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr "sand"
@@ -14039,5 +14146,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr "Track Grade 1"
@@ -14046,5 +14153,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr "Edit Track of grade 1"
@@ -14052,5 +14159,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr "Track Grade 2"
@@ -14059,5 +14166,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr "Edit Track of grade 2"
@@ -14065,5 +14172,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr "Track Grade 3"
@@ -14072,5 +14179,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr "Edit Track of grade 3"
@@ -14078,5 +14185,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr "Track Grade 4"
@@ -14085,5 +14192,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr "Edit Track of grade 4"
@@ -14091,5 +14198,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr "Track Grade 5"
@@ -14098,5 +14205,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr "Edit Track of grade 5"
@@ -14105,5 +14212,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr "Path"
@@ -14112,13 +14219,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr "Edit Path"
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr "Snowmobile"
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr "Ski"
@@ -14126,5 +14233,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr "Hiking"
@@ -14134,5 +14241,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr "Edit Hiking"
@@ -14140,5 +14247,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr "Mountain Hiking"
@@ -14148,5 +14255,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr "Edit Mountain Hiking"
@@ -14154,5 +14261,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr "Demanding Mountain Hiking"
@@ -14162,5 +14269,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Edit Demanding Mountain Hiking"
@@ -14168,5 +14275,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr "Alpine Hiking"
@@ -14176,5 +14283,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr "Edit Alpine Hiking"
@@ -14182,5 +14289,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr "Demanding Alpine Hiking"
@@ -14190,5 +14297,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Edit Demanding Alpine Hiking"
@@ -14196,5 +14303,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr "Difficult Alpine Hiking"
@@ -14204,5 +14311,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Edit Difficult Alpine Hiking"
@@ -14210,10 +14317,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr "Waypoints"
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr "Motorway Junction"
@@ -14221,15 +14328,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr "Edit Motorway Junction"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr "Number"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr "Services"
@@ -14237,5 +14344,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr "Edit Service Station"
@@ -14270,14 +14377,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr "Operator"
@@ -14286,5 +14393,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr "Traffic Lights"
@@ -14294,5 +14401,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr "Pedestrian crossing type"
@@ -14301,27 +14408,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr "uncontrolled"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr "traffic_signals"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr "island"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr "unmarked"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr "Cross on horseback"
@@ -14329,6 +14436,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr "Cross by bicycle"
@@ -14337,11 +14444,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr "Crossing attendant"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr "Crossing type name (UK)"
@@ -14349,30 +14456,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr "pelican"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr "Stop"
@@ -14380,5 +14487,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr "Pedestrian Crossing"
@@ -14387,14 +14494,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr "Edit Crossing"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr "Type name (UK)"
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr "Mini-roundabout"
@@ -14405,14 +14512,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr "Direction"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr "clockwise"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr "Turning Circle"
@@ -14422,20 +14529,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr "City Limit"
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr "Edit City Limit Sign"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr "Second Name"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr "Speed Camera"
@@ -14443,5 +14550,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr "Emergency Phone"
@@ -14449,5 +14556,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr "Incline"
@@ -14455,5 +14562,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr "Incline Steep"
@@ -14462,10 +14569,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr "Ford"
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr "Edit Ford"
@@ -14473,5 +14580,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr "Mountain Pass"
@@ -14479,5 +14586,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr "Edit Mountain Pass"
@@ -14489,7 +14596,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr "Elevation"
@@ -14497,5 +14604,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr "Barriers"
@@ -14503,5 +14610,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr "Bollard"
@@ -14509,5 +14616,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr "Edit Bollard"
@@ -14546,18 +14653,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr "Allowed traffic:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr "Cycle Barrier"
@@ -14566,5 +14677,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr "Block"
@@ -14572,5 +14683,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr "Cattle Grid"
@@ -14578,10 +14689,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr "Edit Cattle Grid"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr "Bus Trap"
@@ -14589,15 +14700,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr "Spikes"
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr "Edit Spikes"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr "Toll Booth"
@@ -14605,5 +14716,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr "Edit Toll Booth"
@@ -14611,10 +14722,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr "Border Control point"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr "Edit Border Control point"
@@ -14624,5 +14735,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr "Hedge"
@@ -14631,5 +14742,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr "Fence"
@@ -14638,5 +14749,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr "Wall"
@@ -14644,5 +14755,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr "City Wall"
@@ -14651,5 +14762,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr "Retaining Wall"
@@ -14661,15 +14772,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr "Entrance"
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr "Edit an Entrance"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr "Gate"
@@ -14677,50 +14788,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr "Edit Gate"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr "Lift Gate"
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr "Edit Lift Gate"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr "Hampshire Gate"
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr "Edit Hampshire Gate"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr "Bump Gate"
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr "Edit Bump Gate"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr "Kissing Gate"
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr "Edit Kissing Gate"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr "Stile"
@@ -14728,15 +14839,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr "Edit Stile"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+#, fuzzy
+msgid "Turnstile"
+msgstr "Turntable"
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "Edit Stile"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr "Sally Port"
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr "Edit Sally Port"
@@ -14747,10 +14870,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr "Water"
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr "Spring"
@@ -14758,5 +14881,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr "Edit Spring"
@@ -14764,5 +14887,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr "Drain"
@@ -14770,10 +14893,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr "Edit Drain"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr "Stream"
@@ -14781,10 +14904,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr "Edit Stream"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr "Canal"
@@ -14792,10 +14915,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr "Edit Canal"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr "River"
@@ -14805,5 +14928,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr "Edit River"
@@ -14811,15 +14934,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr "Edit Water"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr "Edit Land"
@@ -14827,15 +14950,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr "Basin"
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr "Edit Basin Landuse"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr "Reservoir"
@@ -14843,15 +14966,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr "Edit Reservoir Landuse"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr "Covered Reservoir"
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr "Edit Covered Reservoir"
@@ -14859,5 +14982,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr "Riverbank"
@@ -14866,10 +14989,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr "Edit Riverbank"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr "Wetland"
@@ -14880,14 +15003,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr "Edit Wetland"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr "swamp"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr "bog"
@@ -14901,35 +15024,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr "marsh"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr "reedbed"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr "saltmarsh"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr "tidalflat"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr "mangrove"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr "Mud"
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr "Edit Mud"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr "Beach"
@@ -14937,20 +15060,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr "Edit Beach"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr "Bay"
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr "Edit Bay"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr "Cliff"
@@ -14958,10 +15081,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr "Edit Cliff"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr "Coastline"
@@ -14969,5 +15092,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr "Edit Coastline"
@@ -14975,5 +15098,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr "Ferry Route"
@@ -14981,5 +15104,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr "Edit Ferry"
@@ -14988,5 +15111,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr "Boatyard"
@@ -14994,10 +15117,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr "Edit Boatyard"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr "Dock"
@@ -15005,5 +15128,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr "Edit Dock"
@@ -15011,5 +15134,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr "Dam"
@@ -15017,15 +15140,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr "Edit Dam"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr "Waterway Point"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr "Lock Gate"
@@ -15034,5 +15157,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr "Weir"
@@ -15040,20 +15163,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr "Edit Weir"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr "Waterfall"
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr "Edit Waterfall"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr "Turning Point"
@@ -15062,15 +15185,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr "Marina"
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr "Edit Marina"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr "Pier"
@@ -15078,10 +15201,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr "Edit Pier"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr "Ferry Terminal"
@@ -15089,10 +15212,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr "Edit Ferry Terminal"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr "Slipway"
@@ -15102,5 +15225,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr "Edit Slipway"
@@ -15108,10 +15231,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr "Railway"
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr "Railway"
@@ -15119,5 +15242,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr "Edit Railway"
@@ -15147,8 +15270,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr "Optional Types"
@@ -15162,35 +15285,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr "yard"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr "siding"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr "spur"
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr "Narrow Gauge Railway"
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr "Edit Narrow Gauge Railway"
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr "Monorail"
@@ -15198,45 +15321,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr "Edit Monorail"
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr "Preserved"
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr "Edit Preserved Railway"
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr "Light Rail"
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr "Edit Light Rail"
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr "Subway"
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr "Edit Subway"
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr "Tram"
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr "Edit Tram"
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr "Bus Guideway"
@@ -15244,5 +15367,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr "Edit Bus Guideway"
@@ -15251,14 +15374,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr "Disused Rail"
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr "Edit Disused Railway"
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr "Abandoned Rail"
@@ -15267,5 +15390,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr "Level Crossing"
@@ -15274,5 +15397,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr "Crossing"
@@ -15282,5 +15405,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr "Crossing type"
@@ -15288,5 +15411,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr "Turntable"
@@ -15295,10 +15418,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr "Aerialway"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr "Chair Lift"
@@ -15306,10 +15429,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr "Edit Chair Lift"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr "Drag Lift"
@@ -15317,10 +15440,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr "Edit Drag Lift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr "Cable Car"
@@ -15328,10 +15451,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr "Edit Cable Car"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr "Gondola"
@@ -15339,5 +15462,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr "Edit Gondola"
@@ -15345,5 +15468,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr "Station"
@@ -15354,10 +15477,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr "Edit Station"
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr "Fuel"
@@ -15367,5 +15490,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr "Edit Fuel"
@@ -15381,5 +15504,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15389,5 +15512,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr "Edit Parking"
@@ -15395,41 +15518,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr "Capacity"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr "surface"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr "multi-storey"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr "underground"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr "park_and_ride"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr "Spaces for Disabled"
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr "Fee"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr "Wash"
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr "Edit Car Wash"
@@ -15437,5 +15560,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr "Shop"
@@ -15443,15 +15566,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr "Edit Car Shop"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr "Repair"
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr "Edit Car Repair"
@@ -15459,5 +15582,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr "Rental"
@@ -15466,10 +15589,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr "Edit Car Rental"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr "Sharing"
@@ -15477,5 +15600,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr "Edit Car Sharing"
@@ -15483,5 +15606,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr "Edit Bicycle Parking"
@@ -15490,5 +15613,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr "Edit Bicycle Rental"
@@ -15497,15 +15620,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr "Edit Bicycle Shop"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "Public Transport"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -15513,5 +15636,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr "Railway Halt"
@@ -15519,5 +15642,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr "Edit Halt"
@@ -15525,5 +15648,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr "Tram Stop"
@@ -15532,5 +15655,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr "Edit Tram Stop"
@@ -15538,5 +15661,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr "Railway Platform"
@@ -15545,5 +15668,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr "Edit Railway Platform"
@@ -15555,5 +15678,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr "Reference (track number)"
@@ -15561,10 +15684,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr "Area"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr "Subway Entrance"
@@ -15573,10 +15696,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr "Edit Subway Entrance"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr "Wheelchair"
@@ -15585,5 +15708,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr "Bus Station"
@@ -15592,5 +15715,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr "Edit Bus Station"
@@ -15598,5 +15721,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr "Bus Stop"
@@ -15606,5 +15729,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr "Edit Bus Stop"
@@ -15615,6 +15738,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr "Shelter"
@@ -15622,10 +15745,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr "Bus Platform"
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr "Edit Bus Platform"
@@ -15633,5 +15756,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr "Taxi"
@@ -15639,5 +15762,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr "Edit Taxi station"
@@ -15645,5 +15768,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr "Airport"
@@ -15651,15 +15774,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr "Edit Airport"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr "ICAO"
@@ -15668,5 +15791,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr "Accomodation"
@@ -15678,5 +15801,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -15685,15 +15808,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr "Edit Hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr "Stars"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr "Motel"
@@ -15701,20 +15824,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr "Edit Motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr "Guest House"
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr "Edit Guest House"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr "Chalet"
@@ -15722,10 +15845,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr "Edit Chalet"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr "Hostel"
@@ -15733,30 +15856,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr "Edit Hostel"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr "Alpine Hut"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr "Edit Alpine Hut"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr "Caravan Site"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr "Edit Caravan Site"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr "Camp Site"
@@ -15764,10 +15887,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr "Edit Camp Site"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "Food+Drinks"
@@ -15778,5 +15901,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -15784,5 +15907,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr "Edit Restaurant"
@@ -15790,5 +15913,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr "Cuisine"
@@ -15796,61 +15919,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr "italian"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr "chinese"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr "greek"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr "german"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr "indian"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr "turkish"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr "asian"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr "mexican"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr "japanese"
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -15858,9 +15981,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr "Edit Fast Food Restaurant"
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr "Cafe"
@@ -15868,10 +15991,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr "Edit Cafe"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr "Pub"
@@ -15879,20 +16002,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr "Edit Pub"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr "Edit Biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr "Bar"
@@ -15900,10 +16023,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr "Edit Bar"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr "Nightclub"
@@ -15911,20 +16034,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr "Edit Nightclub"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "Tourism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr "Attraction"
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr "Edit Attraction"
@@ -15933,11 +16056,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr "Opening Hours"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "Museum"
@@ -15945,10 +16068,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr "Edit Museum"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "Zoo"
@@ -15957,10 +16080,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr "Edit Zoo"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr "Viewpoint"
@@ -15968,25 +16091,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr "Edit Viewpoint"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr "Theme Park"
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr "Edit Theme Park"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr "Artwork"
@@ -15994,5 +16117,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr "Edit Artwork"
@@ -16000,5 +16123,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr "Information Office"
@@ -16006,80 +16129,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr "Edit Information Office"
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "Map"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr "Map Type"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr "map"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr "citymap"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr "hikingmap"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr "bicyclemap"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
 msgid "Closer Description"
 msgstr "Closer Description"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1701
 msgid "Information Board"
 msgstr "Information Board"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Board Type"
 msgstr "Board Type"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "board"
 msgstr "board"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "history"
 msgstr "history"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "nature"
 msgstr "nature"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "wildlife"
 msgstr "wildlife"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Guidepost (Hiking)"
 msgstr "Guidepost (Hiking)"
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr "Other Information Points"
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr "Edit Shelter"
@@ -16087,25 +16210,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr "Fireplace"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr "Picnic Site"
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr "Edit Picnic Site"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "Historic Places"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "Castle"
@@ -16114,20 +16237,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr "Edit Castle"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "Ruins"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr "Edit Ruins"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr "Archaeological Site"
@@ -16136,10 +16259,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr "Edit Archaeological Site"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr "Battlefield"
@@ -16147,5 +16270,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr "Edit Battlefield"
@@ -16153,15 +16276,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr "Edit Monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr "Memorial"
@@ -16169,45 +16292,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr "Edit Memorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr "Wayside Cross"
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr "Edit Wayside Cross"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr "Wayside Shrine"
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr "Edit Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "Leisure"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr "Water Park"
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr "Edit Water Park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "Playground"
@@ -16215,15 +16338,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr "Edit Playground"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "Fishing"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr "Edit Fishing"
@@ -16231,15 +16354,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr "Sport Facilities"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "Stadium"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr "Edit Stadium"
@@ -16253,6 +16376,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "select sport:"
@@ -16275,4 +16398,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -16333,5 +16464,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16341,5 +16480,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16485,5 +16624,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16589,5 +16728,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16628,29 +16767,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr "sport"
@@ -16660,227 +16800,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr "archery"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr "athletics"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr "lawn bowls"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr "canoeing"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr "climbing"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr "cricket nets"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr "cycling"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr "dog racing"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr "equestrian"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr "football"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr "gymnastics"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr "horse_racing"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr "shooting"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr "skating"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr "skiing"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "soccer"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr "swimming"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "table_tennis"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr "Sports Centre"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr "Edit Sports Centre"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr "Pitch"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr "Edit Pitch"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr "Racetrack"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr "Edit Racetrack"
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr "Golf Course"
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr "Edit Golf Course"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr "Miniature Golf"
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr "Edit Miniature Golf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr "Multi"
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr "Edit Multi"
@@ -16919,191 +17059,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr "pitch"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr "sports_centre"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr "stadium"
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr "10pin"
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr "Edit 10pin"
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr "Athletics"
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr "Edit Athletics"
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr "Archery"
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr "Edit Archery"
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr "Climbing"
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr "Edit Climbing"
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr "Canoeing"
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr "Edit Canoeing"
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr "Cycling"
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr "Edit Cycling"
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr "Dog Racing"
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr "Edit Dog Racing"
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr "Equestrian"
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr "Edit Equestrian"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr "Horse Racing"
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr "Edit Horse Racing"
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr "Gymnastics"
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr "Edit Gymnastics"
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr "Motor Sports"
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr "Edit Motor Sports"
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr "Skating"
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr "Edit Skating"
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr "Edit Skateboard"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr "Swimming"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr "Edit Swimming"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr "Skiing"
@@ -17111,56 +17251,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr "Edit Skiing"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr "Piste type"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr "downhill"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr "nordic"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr "Difficulty"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr "novice"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr "easy"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr "intermediate"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr "advanced"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr "Shooting"
@@ -17168,178 +17308,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr "Edit Shooting"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr "Sport (Ball)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr "Football"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr "Edit Football"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr "American Football"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr "Edit American Football"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr "Edit Australian Football"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr "Edit Baseball"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr "Edit Basketball"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr "Edit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr "Edit Boule"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr "Edit Bowls"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr "Edit Cricket"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr "Edit Cricket Nets"
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr "Edit Croquet"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr "Edit Hockey"
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr "Edit Pelota"
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr "Edit Racquet"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr "Edit Rugby"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr "Table Tennis"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr "Edit Table Tennis"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr "Edit Tennis"
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "Buildings"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr "Building"
@@ -17347,5 +17487,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "Public Building"
@@ -17353,10 +17493,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr "Edit Public Building"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "Town hall"
@@ -17364,10 +17504,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "Edit Town hall"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "Embassy"
@@ -17375,10 +17515,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "Edit Embassy"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "Courthouse"
@@ -17387,10 +17527,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "Edit Courthouse"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "Prison"
@@ -17399,10 +17539,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "Edit Prison"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "Police"
@@ -17412,10 +17552,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "Edit Police"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "Fire Station"
@@ -17424,10 +17564,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "Edit Fire Station"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "Post Office"
@@ -17435,5 +17575,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr "Edit Post Office"
@@ -17441,15 +17581,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr "Preschool"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr "Edit Preschool"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "School"
@@ -17457,10 +17597,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "Edit School"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr "University"
@@ -17468,10 +17608,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr "Edit University"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr "College"
@@ -17479,5 +17619,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr "Edit College"
@@ -17485,5 +17625,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "Cinema"
@@ -17492,10 +17632,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "Edit Cinema"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "Library"
@@ -17504,10 +17644,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "Edit Library"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr "Arts Centre"
@@ -17515,10 +17655,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr "Edit Arts Centre"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "Theatre"
@@ -17527,10 +17667,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "Edit Theatre"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr "Place of Worship"
@@ -17540,5 +17680,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr "Edit Place of Worship"
@@ -17547,6 +17687,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr "Religion"
@@ -17555,66 +17695,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr "christian"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr "jewish"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr "unitarian"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr "Denomination"
@@ -17623,81 +17763,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr "anglican"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr "catholic"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr "evangelical"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr "jehovahs_witness"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr "Addresses"
@@ -17706,5 +17846,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr "Edit Address Information"
@@ -17712,5 +17852,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr "House number"
@@ -17718,20 +17858,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr "House name"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr "City name"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "Post code"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr "Country code"
@@ -17739,5 +17879,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr "Address Interpolation"
@@ -17746,5 +17886,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr "Edit Address Interpolation"
@@ -17752,71 +17892,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr "Numbering scheme"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr "odd"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr "even"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr "all"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr "alphabetic"
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr "Man Made"
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr "Works"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr "Edit Works"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "Tower"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "Edit Tower"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "Water Tower"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "Edit Water Tower"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr "Edit Gasometer"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "Lighthouse"
@@ -17824,10 +17964,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "Edit Lighthouse"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "Windmill"
@@ -17835,10 +17975,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "Edit Windmill"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -17846,10 +17986,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "Edit Pipeline"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr "Sewerage Plant"
@@ -17859,10 +17999,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr "Edit Sewerage Plant"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr "Crane"
@@ -17870,10 +18010,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr "Edit Crane"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr "Beacon"
@@ -17881,10 +18021,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr "Edit Beacon"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr "Survey Point"
@@ -17892,10 +18032,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr "Edit Survey Point"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -17903,5 +18043,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr "Edit Surveillance Camera"
@@ -17909,5 +18049,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr "Power Generator"
@@ -17917,39 +18057,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr "Edit Power Generator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr "hydro"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr "coal"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr "photovoltaic"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr "gas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr "Power Station"
@@ -17958,10 +18098,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr "Edit Power Station"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr "Power Sub Station"
@@ -17970,5 +18110,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr "Edit Power Sub Station"
@@ -17976,10 +18116,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr "Line reference"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr "Power Tower"
@@ -17990,5 +18130,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr "Edit Power Tower"
@@ -17996,5 +18136,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr "Power Line"
@@ -18003,25 +18143,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr "Edit Power Line"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr "Voltage"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr "Amount of Wires"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr "Amenities"
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "Toilets"
@@ -18029,20 +18169,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr "Reference number"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr "Post Box"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "Telephone"
@@ -18051,5 +18191,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr "Edit Telephone"
@@ -18057,5 +18197,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "Coins"
@@ -18063,5 +18203,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr "Notes"
@@ -18069,5 +18209,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr "Electronic purses and Charge cards"
@@ -18075,5 +18215,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr "Debit cards"
@@ -18081,15 +18221,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "Credit cards"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "Telephone cards"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr "Recycling"
@@ -18098,5 +18238,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr "Edit Recycling station"
@@ -18104,35 +18244,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr "Cans"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr "Clothes"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr "Paper"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr "Scrap Metal"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr "Bench"
@@ -18141,20 +18281,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr "Edit Hunting Stand"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr "Hide"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr "Lock"
@@ -18162,22 +18302,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr "Height"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr "low"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr "half"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr "Fountain"
@@ -18186,10 +18326,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr "Edit Fountain"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "Drinking Water"
@@ -18198,10 +18338,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "Edit Drinking Water"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr "Baby Hatch"
@@ -18209,25 +18349,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr "Edit Baby Hatch"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "Shops"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr "Edit Supermarket"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr "Convenience Store"
@@ -18235,10 +18375,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr "Edit Convenience Store"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -18246,10 +18386,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr "Edit Kiosk"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "Vending machine"
@@ -18257,5 +18397,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "Edit Vending machine"
@@ -18263,88 +18403,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "Vending products"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr "public_transport_tickets"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr "public_transport_plans"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr "parking_tickets"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr "food"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "drinks"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr "sweets"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr "cigarettes"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr "photos"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr "animal_food"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "news_papers"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "toys"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr "stamps"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "SIM-cards"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr "telephone_vouchers"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr "vouchers"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr "condoms"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr "excrement_bags"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr "Account or loyalty cards"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "Butcher"
@@ -18352,10 +18492,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "Edit Butcher"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "Baker"
@@ -18363,10 +18503,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "Edit Baker"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr "Florist"
@@ -18374,20 +18514,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr "Edit Florist"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr "Organic"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr "Edit Organic Shop"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr "Alcohol"
@@ -18395,60 +18535,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr "Edit Alcohol Shop"
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr "Beverages"
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr "Edit Beverages Shop"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr "Computer"
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr "Edit Computer Shop"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr "Electronics"
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr "Edit Electronics Shop"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr "Edit Hifi Shop"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr "Furniture"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr "Edit Furniture Shop"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr "Garden Centre"
@@ -18456,10 +18596,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr "Edit Garden Centre"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr "Hardware"
@@ -18467,10 +18607,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr "Edit Hardware Store"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr "Do-it-yourself-store"
@@ -18478,60 +18618,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr "Edit Do-it-yourself-store"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr "Stationery"
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr "Edit Stationery Shop"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr "Hairdresser"
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr "Edit Hairdresser"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr "Shoes"
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr "Edit Shoe Shop"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr "Toys"
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr "Edit Toy Shop"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr "Video"
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr "Edit Video Shop"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "Dry Cleaning"
@@ -18539,10 +18679,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "Edit Dry Cleaning"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "Laundry"
@@ -18550,10 +18690,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "Edit Laundry"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr "Outdoor"
@@ -18561,35 +18701,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr "Edit Outdoor Shop"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr "Sports"
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr "Edit Sports Shop"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr "Optician"
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr "Edit Optician"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "Cash"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "Bank"
@@ -18597,5 +18737,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "Edit Bank"
@@ -18603,10 +18743,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "Automated Teller Machine"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr "Money Exchange"
@@ -18614,5 +18754,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr "Edit Money Exchange"
@@ -18620,15 +18760,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "Edit Automated Teller Machine"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "Health"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr "Doctors"
@@ -18636,20 +18776,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr "Edit Doctors"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr "Dentist"
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr "Edit Dentist"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "Pharmacy"
@@ -18657,5 +18797,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "Edit Pharmacy"
@@ -18663,10 +18803,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr "Dispensing"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "Hospital"
@@ -18674,10 +18814,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "Edit Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr "Emergency Access Point"
@@ -18686,5 +18826,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr "Edit Emergency Access Point"
@@ -18693,20 +18833,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr "Point Number"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr "Point Name"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr "Phone Number"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Use international code, like +12-345-67890)"
@@ -18714,5 +18854,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr "Veterinary"
@@ -18721,56 +18861,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr "Edit Veterinary"
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr "Continent"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr "Edit Continent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr "Country"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr "Edit Country"
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr "State"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr "Edit State"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr "Region"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr "Edit Region"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr "County"
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr "Edit County"
@@ -18778,15 +18917,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr "City"
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr "Edit City"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr "Town"
@@ -18794,10 +18933,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr "Edit Town"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr "Suburb"
@@ -18805,25 +18944,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr "Edit Suburb"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "Village"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "Edit Village"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr "Hamlet"
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr "Edit Hamlet"
@@ -18831,5 +18970,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr "Locality"
@@ -18837,10 +18976,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr "Edit Locality"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "Island"
@@ -18848,5 +18987,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "Edit Island"
@@ -18854,5 +18993,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr "Cave Entrance"
@@ -18860,10 +18999,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr "Edit Cave Entrance"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "Peak"
@@ -18871,10 +19010,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "Edit Peak"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr "Glacier"
@@ -18882,10 +19021,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr "Edit Glacier"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr "Volcano"
@@ -18893,70 +19032,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr "Edit Volcano"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr "Boundaries"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr "National"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr "Edit National Boundary"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr "Administrative"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr "Edit Administrative Boundary"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr "Civil"
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr "Edit Civil Boundary"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr "Political"
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr "Edit Political Boundary"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr "National park"
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr "Edit National Park Boundary"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr "Land use"
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "Tree"
@@ -18965,15 +19104,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "Edit Tree"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr "Botanical Name"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr "Wood"
@@ -18982,5 +19121,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr "Edit Wood"
@@ -18988,17 +19127,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr "coniferous"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr "deciduous"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr "mixed"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "Forest"
@@ -19007,14 +19146,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr "Edit Forest Landuse"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr "Nature Reserve"
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr "Edit Nature Reserve"
@@ -19022,25 +19161,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr "Scree"
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr "Edit Scree"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr "Scrub"
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr "Edit Scrub"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr "Fell"
@@ -19048,10 +19187,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr "Edit Fell"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr "Heath"
@@ -19059,5 +19198,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr "Edit Heath"
@@ -19065,5 +19204,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr "Farmyard"
@@ -19072,45 +19211,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr "Edit Farmyard Landuse"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr "Farmland"
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr "Edit Farmland Landuse"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr "Meadow"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr "Edit Meadow Landuse"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr "Vineyard"
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr "Edit Vineyard Landuse"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr "Allotments"
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr "Edit Allotments Landuse"
@@ -19118,25 +19257,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr "Garden"
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr "Edit Garden"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr "Grass"
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr "Edit Grass Landuse"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr "Village Green"
@@ -19144,10 +19283,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr "Edit Village Green Landuse"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr "Common"
@@ -19155,20 +19294,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr "Edit Common"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr "Edit Park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr "Recreation Ground"
@@ -19176,5 +19315,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr "Edit Recreation Ground Landuse"
@@ -19182,15 +19321,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr "Residential area"
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr "Edit Residential Landuse"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr "Graveyard"
@@ -19198,9 +19337,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr "Edit Graveyard"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr "Cemetery"
@@ -19208,39 +19347,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr "Edit Cemetery Landuse"
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr "Retail"
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr "Edit Retail Landuse"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr "Commercial"
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr "Edit Commercial Landuse"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr "Edit Industrial Landuse"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr "Railway land"
@@ -19248,15 +19387,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr "Edit Railway Landuse"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr "Military"
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr "Edit Military Landuse"
@@ -19264,55 +19403,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr "Construction area"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr "Edit Construction Landuse"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr "Brownfield"
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr "Edit Brownfield Landuse"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr "Greenfield"
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr "Edit Greenfield Landuse"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr "Landfill"
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr "Edit Landfill Landuse"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr "Quarry"
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr "Edit Quarry Landuse"
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -19322,5 +19461,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr "Edit Multipolygon"
@@ -19329,10 +19468,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr "outer segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr "inner segment"
@@ -19340,5 +19479,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr "Turn restriction"
@@ -19347,5 +19486,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr "Edit Turn Restriction"
@@ -19353,34 +19492,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr "no left turn"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr "no right turn"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr "no straight on"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr "no U turn"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr "only turn right"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr "only turn left"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr "only straight on"
@@ -19389,15 +19528,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr "from way"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr "via node or way"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr "to way"
@@ -19405,5 +19544,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr "Route"
@@ -19412,5 +19551,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr "Edit Route"
@@ -19418,5 +19557,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr "Route type"
@@ -19488,24 +19627,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr "bicycle"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr "road"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr "ski"
@@ -19558,20 +19697,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr "foot"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr "hiking"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr "detour"
@@ -19585,10 +19724,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr "subway"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr "Symbol description"
@@ -19596,26 +19735,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr "Network"
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "Route type"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr "proposed"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr "alternate"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr "temporary"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr "connection"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr "Colour (hex)"
@@ -19624,30 +19769,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr "route segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr "forward segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr "backward segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr "halt point"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr "forward halt point"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr "backward halt point"
@@ -19683,6 +19828,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19698,5 +19844,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19715,5 +19869,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr "standard"
@@ -19807,7 +19961,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr "bridge"
@@ -20072,15 +20226,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr "deprecated"
@@ -20122,5 +20276,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr "horse"
@@ -20258,4 +20412,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20267,5 +20427,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20273,5 +20433,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20308,5 +20468,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20330,11 +20490,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr "barrier"
@@ -20358,5 +20518,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20397,7 +20557,7 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
-msgstr ""
+msgstr "motorroad"
 
 #. color tertiary
@@ -20433,6 +20593,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr "street"
@@ -20488,7 +20648,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr "highway_track"
@@ -20541,11 +20701,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr "rail"
@@ -20566,5 +20734,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr "services"
@@ -20578,5 +20746,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr "ford"
@@ -20597,5 +20765,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr "turningcircle"
@@ -20609,6 +20777,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr "emergency_access_point"
@@ -20623,5 +20791,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr "riverbank"
@@ -20635,5 +20803,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr "stream"
@@ -20647,5 +20815,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr "dock"
@@ -20673,5 +20841,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr "aqueduct"
@@ -20814,5 +20982,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20839,13 +21007,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr "manmade"
@@ -20907,7 +21075,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr "railwaypoint"
@@ -20930,10 +21098,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr "otherrail"
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr "railover"
@@ -20969,7 +21137,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr "oldrail"
@@ -21014,6 +21182,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr "aeroway"
@@ -21027,5 +21195,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr "terminal"
@@ -21047,5 +21215,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr "aeroway_dark"
@@ -21059,5 +21227,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr "aeroway_light"
@@ -21065,4 +21233,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21105,7 +21280,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr "aerialway"
@@ -21122,5 +21297,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr "piste_easy"
@@ -21135,5 +21310,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr "piste_intermediate"
@@ -21148,5 +21323,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr "piste_advanced"
@@ -21161,5 +21336,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr "piste_expert"
@@ -21174,5 +21349,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr "piste_freeride"
@@ -21187,5 +21362,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr "piste_novice"
@@ -21208,4 +21383,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -21216,4 +21398,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -21290,10 +21480,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr "power"
@@ -21307,5 +21498,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr "pier"
@@ -21319,5 +21510,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr "pipeline"
@@ -21445,12 +21636,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr "leisure"
@@ -21464,5 +21655,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr "marina"
@@ -21534,8 +21725,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr "amenity"
@@ -21637,10 +21828,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr "amenity_traffic"
@@ -21660,4 +21851,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21679,4 +21877,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -22000,4 +22205,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -22024,24 +22237,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr "amenity_light"
@@ -22073,6 +22294,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr "light_water"
@@ -22133,8 +22354,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr "health"
@@ -22487,26 +22708,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr "shop"
@@ -22561,5 +22782,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22578,8 +22799,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr "hotel"
@@ -22729,9 +22950,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr "tourism"
@@ -22803,8 +23024,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr "historic"
@@ -22875,8 +23096,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr "green"
@@ -22890,5 +23111,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr "quarry"
@@ -22902,5 +23123,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr "landfill"
@@ -22922,5 +23143,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr "basin"
@@ -22934,5 +23155,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr "forest"
@@ -22946,5 +23167,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr "farmyard"
@@ -22967,5 +23188,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr "retail"
@@ -22979,5 +23200,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr "industrial"
@@ -22991,5 +23212,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr "brownfield"
@@ -23003,5 +23224,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr "greenfield"
@@ -23015,5 +23236,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr "railland"
@@ -23070,7 +23291,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr "military"
@@ -23084,5 +23305,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr "cemetery"
@@ -23095,5 +23316,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr "peak"
@@ -23108,5 +23329,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr "glacier"
@@ -23120,5 +23341,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr "volcano"
@@ -23173,8 +23394,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr "natural"
@@ -23188,5 +23409,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr "scrub"
@@ -23200,5 +23421,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr "heath"
@@ -23212,5 +23433,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr "wood"
@@ -23224,5 +23445,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr "mud"
@@ -23236,5 +23457,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr "beach"
@@ -23312,8 +23533,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr "route"
@@ -23361,7 +23582,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr "boundary"
@@ -23503,10 +23724,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr "place"
@@ -23554,6 +23775,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr "address"
@@ -23850,24 +24071,15 @@
 msgstr "Terraserver Urban"
 
+#~ msgid "Move"
+#~ msgstr "Move"
+
+#~ msgid "Data Layer"
+#~ msgstr "Data Layer"
+
+#~ msgid "Not implemented yet."
+#~ msgstr "Not implemented yet."
+
 #~ msgid "Unknown file extension."
 #~ msgstr "Unknown file extension."
-
-#~ msgid "Move"
-#~ msgstr "Move"
-
-#~ msgid "Invalid projection"
-#~ msgstr "Invalid projection"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Change the projection to {0} first."
-
-#~ msgid "end"
-#~ msgstr "end"
-
-#~ msgid "Data Layer"
-#~ msgstr "Data Layer"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Not implemented yet."
 
 #~ msgid "Resolve Conflicts"
@@ -23942,4 +24154,7 @@
 #~ msgid "Navigation"
 #~ msgstr "Navigation"
+
+#~ msgid "end"
+#~ msgstr "end"
 
 #~ msgid "OSM username (email)"
@@ -24230,4 +24445,10 @@
 #~ "elements have a history."
 
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Change the projection to {0} first."
+
+#~ msgid "Invalid projection"
+#~ msgstr "Invalid projection"
+
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
Index: /applications/editors/josm/i18n/po/es.po
===================================================================
--- /applications/editors/josm/i18n/po/es.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/es.po	(revision 17069)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
 "PO-Revision-Date: 2009-08-04 11:10+0000\n"
 "Last-Translator: cdavila <cdavilam@jemila.jazztel.es>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-10 11:58+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -56,6 +56,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -100,6 +100,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "Error"
@@ -110,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "Cambios no guardados"
@@ -128,10 +128,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -148,15 +148,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -186,6 +186,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -215,5 +215,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -371,5 +371,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
 msgstr ""
@@ -453,9 +453,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -488,7 +488,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -575,37 +575,37 @@
 msgstr "{0} nodos en vía {1} superar el máximo número permitido de nodos {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "datos"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "conflicto"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "descargar"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zoom a {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Aumentar la vista a {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -615,30 +615,30 @@
 msgstr "Vista: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "No hay nada seleccionado a lo que hacer zoom."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "No hay conflictos sobre los que acercarse"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "Combinar vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "Combinar varias vías en una."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "Por favor, selecciona al menos dos vías para combinar."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr "¿Combinar vías con diferentes relaciones?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -647,13 +647,13 @@
 "Las vías seleccionadas tienen diferentes relaciones. ¿Aún quiere combinarlas?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "Combinar de todos modos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "¿Cambiar direcciones?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -663,10 +663,10 @@
 "alguna de ellas?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "Invertir y combinar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -674,20 +674,20 @@
 msgstr "Introduzca valores para todos los conflictos."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Resolver conflictos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combinar {0} vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "Todas la vías están vacías"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -736,6 +736,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -757,6 +757,6 @@
 msgstr "Eliminar objetos seleccionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -766,5 +766,5 @@
 msgstr "Sobrescribir"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -898,7 +898,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "Exportar los datos a archivo GPX"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -914,5 +913,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -930,5 +929,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -1004,22 +1003,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "Unir nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "Unir nodos en el más antiguo."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "Por favor seleccione por lo menos dos nodos para unir."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr "¿Unir nodos con diferentes relaciones?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1029,9 +1028,9 @@
 "quiere unirlos?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "Unir de todos modos"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -1039,5 +1038,5 @@
 "uso."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1294,7 +1293,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "No se encontró ninguna intersección. Nada ha cambiado."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1906,5 +1904,5 @@
 msgstr "Errores durante la descarga"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1922,5 +1920,5 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr "Primitivas movidas o borradas"
@@ -1959,11 +1957,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2106,5 +2104,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2184,5 +2182,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Búsqueda de objetos."
@@ -2318,5 +2316,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Buscar"
@@ -2524,5 +2522,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2568,5 +2566,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr "Borrar de la relación"
@@ -2608,9 +2606,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "Unir {0} nodos"
-msgstr[1] "Unir {0} nodos"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2648,9 +2646,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "Rotar {0} {1}"
-msgstr[1] "Rotar {0} {1}"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2817,7 +2815,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "Cambiar {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2827,5 +2825,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2872,5 +2870,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2903,5 +2901,5 @@
 msgstr "el paremetro \"{0}\" no es una clase aceptable, obtenido \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2915,5 +2913,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "ferrocarril"
@@ -2928,5 +2926,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3217,5 +3215,5 @@
 msgstr "No mostrar de nuevo"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3226,5 +3224,5 @@
 "Compruebe la URL del servidor en sus preferencias y su conexión a Internet."
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3237,10 +3235,10 @@
 "<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr "Violación de condición previa"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3248,25 +3246,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "desconocido"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3276,9 +3274,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3287,9 +3285,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "Excepción inesperada"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3299,9 +3309,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "Host desconocido"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3314,5 +3324,5 @@
 "de error es: <br> {0} </ html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr "Primitiva ya eliminada"
@@ -3402,10 +3412,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "Nombre de usuario"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "Contraseña"
@@ -3609,15 +3619,15 @@
 msgstr "(sin objeto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "capa no listada"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "La capa ''{0}'' debe estar en la lista de capas"
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3673,5 +3683,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr "Mía respecto a la suya"
@@ -3680,5 +3690,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr "Mía respecto a la fusionada"
@@ -3687,20 +3697,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr "Suya respecto a la fusionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr "el rol {0} no participa en la pareja de comparación {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3710,6 +3720,6 @@
 msgstr "Etiquetas"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3717,6 +3727,6 @@
 msgstr "Nodos"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3724,23 +3734,23 @@
 msgstr "Miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr "Ningún conflito de etiqueta pendiente de ser resuelto"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "Etiquetas ({0} conflictivas)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr "{0} etiquetas conflictivas pendientes de ser resueltas"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr "Nodos (resueltos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
@@ -3749,17 +3759,17 @@
 "lista de nodos de esta vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "Nodos (con conflictos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr "Conflictos pendientes en la lista de nodos de esta vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "Miembros (resueltos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3769,64 +3779,64 @@
 "lista de miembros de esta relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "Miembros (con conflictos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr "Conflictos pendientes en la lista de miembros de esta relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr "Ningún conflicto de propiedades pendiente"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "Propiedades (con conflictos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr "Conflictos de propiedades pendientes de resolver"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "Resolución de conflictos"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr "pa´rametro actual fuera del rango: obtenido {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr "inexperado valor del parámetro \"index\". Obtenido {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr "objeto {0} no encontrado en la lista"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr "bloquear desplazamiento"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr "Comparar "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr "Mi versión"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr ""
@@ -3834,11 +3844,11 @@
 "locales"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr "Versión fusionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3848,10 +3858,10 @@
 "la decisión de combinarlos."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr "Su versión"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr ""
@@ -3859,18 +3869,18 @@
 "del servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr "> arriba"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
 "Copiar mis nodos seleccionados al inicio de la lista de nodos fusionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr "> abajo"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr ""
@@ -3878,5 +3888,5 @@
 "fusionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3886,5 +3896,5 @@
 "la lista de elementos fusionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3894,10 +3904,10 @@
 "en la lista de elementos fusionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
 "Copiar su elemento seleccionado al inicio de la lista de elementos fusionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr ""
@@ -3905,5 +3915,5 @@
 "fusionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3913,5 +3923,5 @@
 "la lista de elementos fusionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3921,21 +3931,21 @@
 "la lista de elementos fusionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr "Subir"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr "Subir los elementos seleccionados una posición"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr "Bajar"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr "Bajar las entradas seleccionadas una posición"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3944,28 +3954,28 @@
 msgstr "Eliminar"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr ""
 "Eliminar las entradas seleccionadas de la lista de elementos fusionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr "Congelar"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr "Congelar la lista actual de elementos fusionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr "Desconjelar"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr "Descongelar la lista de elementos fusionados y comenzar la fusión"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3975,5 +3985,5 @@
 "las suyas</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3984,5 +3994,5 @@
 "las suyas</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3991,5 +4001,5 @@
 msgstr[1] "Mi versión ({0} entradas)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3998,5 +4008,5 @@
 msgstr[1] "Versión fusionada ({0} entradas)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -4005,21 +4015,21 @@
 msgstr[1] "Su versión ({0} entradas)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -4029,5 +4039,5 @@
 msgstr "el parámetro '{0}' no debe ser nulo"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -4039,5 +4049,5 @@
 "participación en el ajuste sincronizado"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -4045,9 +4055,9 @@
 msgstr "ajustable {0} no se ha registrado todavía"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr "Nodo"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4056,10 +4066,10 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr "índice de columna inexperado. Obtenido {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -4070,19 +4080,19 @@
 "{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr "Comunicación fallida con el servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr "Sí, deshacer el borrado de ellos también"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr "No, calcelar la operación"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -4094,9 +4104,9 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr "¿Deshacer el borrado de los nodos adicionales?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -4109,14 +4119,14 @@
 "borrado de los primitivos?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr "¿Deshacer borrado de primitivos dependientes?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr ""
 "Propiedade de mi conjunto de datos, es decir el conjunto de datos locales"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -4126,5 +4136,5 @@
 "elementos cuando se apliquen las decisiones de fusionar."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr ""
@@ -4132,86 +4142,86 @@
 "servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr "Coordenadas:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr "Estado borrado:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr "Estado visible:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "borrado"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr "no borrado"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr "visible (en el servidor)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr "no visible (en el servidor)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr "Mantener un clon de la versión local"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr "Eliminar físicamente del conjunto de datos locales"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr "Mantener mis coordenadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr "Mantener sus coordenadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr "Conflicto no resuelto entre las diferentes coordenadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr "Mantener mi estado suprimido"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr "Mantener su estado suprimido"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr "Mantener mi estado visible"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr "Sí, reiniciar el id"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr "No, abortar"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4224,17 +4234,17 @@
 "asignará<br>un nuevo identificador. <br> ¿Está de acuerdo? </ html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr "Reiniciar el id a 0"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr "Mantener su estado visible"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr "Sí, purgarlo"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4243,14 +4253,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr "Eliminar desde el conjunto de datos"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr "Conflicto entre estado visibles sin decidir"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4258,21 +4268,21 @@
 msgstr "Rol"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr "Primitiva"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4280,8 +4290,8 @@
 msgstr "<indefinido>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
@@ -4289,6 +4299,6 @@
 "El conjunto de datos fusionado no incluirá una etiqueta con la clave {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4296,7 +4306,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4308,7 +4318,7 @@
 msgstr "Key"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4321,33 +4331,33 @@
 msgstr "Valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr ""
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr "El parámetro 'col' debe ser 0 o 1. Obtenido {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr "Mi versión (conjunto de datos locales)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr "Su versión (conjunto de datos del servidor)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ">"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 "Mantener la pareja clave/valor seleccionado del conjunto de datos locales"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr ""
@@ -4355,14 +4365,14 @@
 "servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr "Pendiente"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr "Marcar la etiqueta seleccionada como pendiente"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4382,8 +4392,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4422,5 +4432,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4525,83 +4535,83 @@
 msgstr "Mostrando el historial de la primitiva seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "Capas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "Abrir un listado de todas las capas cargadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "Borrar la capa seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr "Eliminar capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "Mostrar/Ocultar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "Cambia estado de visibilidad de la capa seleccionada."
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "Mover la capa seleccionada una fila arriba"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "Mover la capa seleccionada una fila abajo"
@@ -4611,6 +4621,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4619,22 +4629,22 @@
 msgstr[1] "Esto cambiará {0} objetos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "Un valor vacío elimina la clave."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<diferente>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "¿Modificar valores?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4642,5 +4652,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4649,41 +4659,41 @@
 msgstr[1] "Cambiar las propiedades de hasta {0} objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "Por favor, selecciona una etiqueta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "Por favor, selecciona un valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 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/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "Propiedades/Relaciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "Propiedades de los objetos seleccionados."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "Miembro de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "Añadir propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4700,39 +4710,39 @@
 msgstr "Añadir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 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/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "Editar propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 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/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propiedades: {0} / Miembros: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "Propiedades / Miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "Cambiar relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, 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/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "Borrar la clave seleccionada en todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "Eliminar propiedades"
@@ -4744,5 +4754,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "Relaciones"
@@ -4774,31 +4784,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "Selección actual"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "Abrir una ventana de selección."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "Zoom a los elementos seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "Refrescar la lista de selección."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "Zoom a la selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Sel.: Rel.:{0} / Vías:{1} / Nodos:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4806,5 +4816,5 @@
 msgstr "Selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4813,5 +4823,5 @@
 msgstr[1] "{0} vías"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4820,5 +4830,5 @@
 msgstr[1] "{0} relaciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5030,7 +5040,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "Borrar la relación seleccionada"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -5113,5 +5122,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5355,5 +5364,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "Lugares"
@@ -5400,21 +5409,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "tipo"
@@ -6214,72 +6223,517 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "Nombre"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr "Versión {0} creada en {1} por {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr "Versión"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr "Imágenes para {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr "Leer gpx"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "No hay hora para el punto {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, 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}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr ""
+"No se han encontrado imágenes con metadatos legibles sobre la fecha y hora."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "Leyendo {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr "Imagenes Geoetiquetadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr "Iniciar GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr "Finalizar GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr "delta actual: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr "diferencia de zona horaria: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "imagen"
+msgstr[1] "imagenes"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} dentro de la traza."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "Sincronizar reloj"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "Imágenes JPEG (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "La fecha en el archivo \"{0}\" no pudo ser analizada sintácticamente."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, 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}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "Imagen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Introduce la fecha mostrada (mm/dd/aaaa HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr "Zona horaria del GPS (diferencia con la foto)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr "Sincronizar hora con la del receptor GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr "La hora no pudo ser analizada sintácticamente."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr "punto GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "Personalice el dibujo de línea"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr "Usar las preferencias globales"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr "Dibujar las líneas entre puntos en esta capa"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr "No dibujar las líneas entre puntos en esta capa"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr "Seleccione las opciones de dibujo de línea"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "Personalizar colores"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Predeterminado"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Seleccionar una color"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr "Marcadores desde puntos nombrados"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Puntos de traza nombrados desde {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "Importar audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr "archivos Wave Audio (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Marcadores de audio desde {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "Importar imágenes"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} traza, "
+msgstr[1] "{0} trazas, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} ruta, "
+msgstr[1] "{0} rutas, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} nodo de vía"
+msgstr[1] "{0} nodos de vía"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr "Nombre: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr "Descripción: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr "Rango de tiempo "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr "Longitud: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "Convertir en capa de datos"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+msgid ""
+"<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 "
+"peligroso.<br>Si quiere subir trazas, consulte aquí:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces (EN)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Convertido desde: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr "Descargar datos de OSM a lo largo de esta traza"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr "Descargar todo entre:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr "{0} metros"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr "Área máxima por petición:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km2"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Esta acción requiere {0} peticiones<br>individuales de descarga."
+"<br¿Desea continuar?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr "No hay traza gpx disponible en la capa para asociar el audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"Algunos puntos de interés con marcas temporales anteriores al inicio de la "
+"traza o posterior a su finalización fueron omitidos o trasladados al "
+"comienzo."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Algunos nodos de vía que estaban demasiado lejos de la traza para que sus "
+"tiempos fueran razonablemente estimados se han omitido."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Capa de datos {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr "fuera del área descargada"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr "versión {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} formado por:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} borrados.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr "sin ajustar"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr "Versión del API: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr "Convertir a capa de gpx"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6288,7 +6742,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6298,450 +6752,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "Nombre"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr "Versión {0} creada en {1} por {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr "Versión"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr "Imágenes para {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr "Leer gpx"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "No hay hora para el punto {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, 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}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr ""
-"No se han encontrado imágenes con metadatos legibles sobre la fecha y hora."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Leyendo {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr "Imagenes Geoetiquetadas"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr "Iniciar GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr "Finalizar GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr "delta actual: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr "diferencia de zona horaria: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "imagen"
-msgstr[1] "imagenes"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} dentro de la traza."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "Sincronizar reloj"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "Imágenes JPEG (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "La fecha en el archivo \"{0}\" no pudo ser analizada sintácticamente."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, 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}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "Imagen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Introduce la fecha mostrada (mm/dd/aaaa HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr "Zona horaria del GPS (diferencia con la foto)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr "Sincronizar hora con la del receptor GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr "La hora no pudo ser analizada sintácticamente."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr "punto GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "Personalice el dibujo de línea"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "Usar las preferencias globales"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr "Dibujar las líneas entre puntos en esta capa"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr "No dibujar las líneas entre puntos en esta capa"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr "Seleccione las opciones de dibujo de línea"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "Personalizar colores"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Predeterminado"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Seleccionar una color"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr "Marcadores desde puntos nombrados"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Puntos de traza nombrados desde {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "Importar audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr "archivos Wave Audio (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Marcadores de audio desde {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "Importar imágenes"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} traza, "
-msgstr[1] "{0} trazas, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} ruta, "
-msgstr[1] "{0} rutas, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} nodo de vía"
-msgstr[1] "{0} nodos de vía"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr "Nombre: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr "Descripción: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr "Rango de tiempo "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr "Longitud: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "Convertir en capa de datos"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-msgid ""
-"<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 "
-"peligroso.<br>Si quiere subir trazas, consulte aquí:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces (EN)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Convertido desde: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr "Descargar datos de OSM a lo largo de esta traza"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr "Descargar todo entre:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr "{0} metros"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr "Área máxima por petición:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km2"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Esta acción requiere {0} peticiones<br>individuales de descarga."
-"<br¿Desea continuar?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr "No hay traza gpx disponible en la capa para asociar el audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-"Algunos puntos de interés con marcas temporales anteriores al inicio de la "
-"traza o posterior a su finalización fueron omitidos o trasladados al "
-"comienzo."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Algunos nodos de vía que estaban demasiado lejos de la traza para que sus "
-"tiempos fueran razonablemente estimados se han omitido."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Capa de datos {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr "fuera del área descargada"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr "versión {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} formado por:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} borrados.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr "sin ajustar"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr "Versión del API: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr "Convertir a capa de gpx"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -7144,5 +7153,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "Coche"
@@ -7159,16 +7168,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "Bicicleta"
@@ -7196,14 +7207,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "Pie"
@@ -7429,19 +7443,19 @@
 msgstr "Idioma"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr "Activar los valores por defecto internos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr "Estilos de semiología cartográfica"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr "Estilo usado"
@@ -7570,37 +7584,11 @@
 msgstr "Contraseña del servidor proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr "La URL base del servidor OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr "Nombre de usuario (correo-e) a la cuenta OSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"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."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "URL base del servidor"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr "Nombre de usuario OSM (correo-e)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "Contraseña OSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -7975,7 +7963,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "No se pudo leer \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -8082,7 +8070,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "Rol ''{0}'' desconocido."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8242,23 +8230,49 @@
 msgstr "Archivo bz2 inválido"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "Contraseña o nombre de usuario incorrectos"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Advertencia: La contraseña se transferirá sin cifrar."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "Grabar nombre de usuario y contraseña (sin cifrar)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "Introduzca contraseña"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
 msgstr "Inicio de sesión"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr "Nombre de usuario (correo-e) a la cuenta OSM"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"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."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr "Nombre de usuario OSM (correo-e)"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "Contraseña OSM"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -8268,7 +8282,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-msgstr "Se esperaba instancia de OsmDataLayer o GpxLayer. Obtenida \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -8438,14 +8452,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "Tipo de miembro \"{0}\" desconocido."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "Preparando datos OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr "id del nodo mal formado"
@@ -8910,5 +8924,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr "Descripción"
@@ -9329,5 +9343,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr "Error al leer el archivo"
@@ -9587,5 +9601,4 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
-#, fuzzy
 msgid ""
 "To enable the cadastre WMS plugin, change\n"
@@ -9593,6 +9606,4 @@
 "projection and retry"
 msgstr ""
-"Para activar el componente WMS Catastro cambie\n"
-"la proyección de JOSM a Lambert y reinicie la aplicación"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9686,5 +9697,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -10228,7 +10239,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr "lámina de agua"
@@ -10413,7 +10424,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "nombre"
+msgstr ""
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10984,12 +10994,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "comenzar"
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0} nodo"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11131,5 +11141,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr "Nombre de la calle"
@@ -11977,7 +11987,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr "edificio"
@@ -11991,5 +12001,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr "área"
@@ -12229,17 +12239,14 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "Por favor, seleccione la fila a editar"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "Salvar capa WMS"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Start adjusting"
-msgstr "Iniciar enrutamiento"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
@@ -12248,7 +12255,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "Ningún cambio que subir"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -12262,19 +12268,19 @@
 "Esto puede dar lugar a unas coordenadas erróneas."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr "Descarga automática"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Capa WMS ({0}) descargándose automáticamente en el zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Capa WMS ({0}), descargando en zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -12283,42 +12289,42 @@
 "o cambe la resolución"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr "Descargar las teselas visibles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr "Cambiar resolución"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr "Recargar teselas erróneas"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr "Canal alfa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr "Guardar capa WMS como archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr "Salvar capa WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr "Cargar capa WMS desde archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr "Cargar capa WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Versión de archivo WMS no soportada; encontrada {0}, esperada {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr "Error en el formato del archivo"
@@ -12710,4 +12716,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12744,5 +12752,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr "Calles"
@@ -12753,5 +12761,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Autopista"
@@ -12760,5 +12768,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr "Editar autopista"
@@ -12785,8 +12793,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr "Referencia"
@@ -12827,21 +12835,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr "Capa"
@@ -12855,8 +12863,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr "Carriles"
@@ -12874,15 +12882,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr "Velocidad max. (km/h)"
@@ -12919,16 +12927,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr "Sentido único"
@@ -12970,19 +12978,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Puente"
@@ -13018,19 +13026,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr "Túnel"
@@ -13064,18 +13072,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr "Desmonte"
@@ -13109,18 +13117,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr "Terraplén"
@@ -13128,5 +13136,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr "Enlace de autopista"
@@ -13135,5 +13143,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr "Editar enlace de autopista"
@@ -13141,5 +13149,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr "Carretera principal"
@@ -13148,5 +13156,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr "Editar carretera principal"
@@ -13156,6 +13164,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr "Autovía"
@@ -13163,5 +13171,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr "Enlace a carretera principal"
@@ -13170,5 +13178,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr "Editar enlace a carretera principal"
@@ -13181,5 +13189,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Carretera primaria"
@@ -13188,5 +13196,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr "Editar carretera primaria"
@@ -13194,10 +13202,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr "Enlace a carretera primaria"
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr "Editar carretera primaria"
@@ -13209,5 +13217,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Carretera secundaria"
@@ -13217,5 +13225,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr "Editar carretera secundaria"
@@ -13223,5 +13231,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr "Carretera local"
@@ -13231,5 +13239,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr "Editar"
@@ -13241,5 +13249,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Carretera sin denominación"
@@ -13249,5 +13257,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr "Editar carretera sin denominación"
@@ -13274,19 +13282,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr "Anchura (metros)"
@@ -13298,5 +13306,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Calle urbana"
@@ -13305,5 +13313,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr "Editar calle urbana"
@@ -13327,13 +13335,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr "Superficie"
@@ -13353,20 +13361,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr "pavimentada"
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr "sin pavimentar"
@@ -13374,12 +13382,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr "adoquinado"
@@ -13387,5 +13395,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr "Calle residencial"
@@ -13394,5 +13402,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr "Editar calle residencial"
@@ -13400,5 +13408,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr "Vía de servicio"
@@ -13407,5 +13415,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr "Editar vía de servicio"
@@ -13415,18 +13423,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr "Tipo de vía de servicio"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr "callejón"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr "camino de entrada (a garage, casa, etc.)"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr "pasillo de aparcamiento"
@@ -13434,5 +13442,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr "Pasillo de aparcamiento"
@@ -13442,5 +13450,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr "Editar pasillo de aparcamiento"
@@ -13448,5 +13456,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr "Carretera (tipología desconocida)"
@@ -13455,5 +13463,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr "Editar carretera (tipología desconocida)"
@@ -13462,20 +13470,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr "Restricciones de tráfico"
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr "Editar restricciones de tráfico"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr "Peaje"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr "Sin salida (cul-de-sac)"
@@ -13488,8 +13496,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr "Acceso"
@@ -13533,23 +13541,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr "sí"
@@ -13562,40 +13570,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr "privado"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr "designado"
@@ -13608,19 +13616,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr "destino"
@@ -13643,65 +13651,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr "permisivo"
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr "agrícola"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr "no"
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr "Mercancías"
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Vehículo de mercacías pesado (hgv)"
@@ -13716,10 +13724,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr "Caballo"
@@ -13735,13 +13743,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr "Moto"
@@ -13757,30 +13765,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr "Coche"
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr "Vehiculos de servicio público (psv)"
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr "Barco a motor"
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr "Barco"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr "Velocidad mínima (km/h)"
@@ -13788,25 +13796,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr "Peso máximo (t)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr "Altura max. (en metros)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr "Anchura max. (en metros)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr "Longitud max. (en metros)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr "Rotonda"
@@ -13817,5 +13825,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr "Editar una intersección"
@@ -13837,9 +13845,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr "Tipo"
@@ -13859,10 +13867,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr "Autopista"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr "Acceso a autopista"
@@ -13884,10 +13892,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr "Carretera principal"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr "Enlace a carretera principal"
@@ -13909,10 +13917,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr "vía primaria"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr "acceso a vía primaria"
@@ -13934,6 +13942,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr "vía secundaria"
@@ -13947,9 +13955,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr "carretera local"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr "carretera sin denominación"
@@ -13963,9 +13971,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr "calle urbana"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr "calle residencial"
@@ -13995,10 +14003,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr "vía de servicio"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr "carril bus guiado"
@@ -14006,4 +14014,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -14021,6 +14036,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr "en construcción"
@@ -14031,10 +14046,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr "Editar un puente"
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr "Editar túnel"
@@ -14042,19 +14057,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr "Vías"
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr "En construcción"
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr "Editar una vía en construcción"
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr "Intersección"
@@ -14070,5 +14085,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr "rotonda"
@@ -14077,5 +14092,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr "Camino de herradura"
@@ -14083,5 +14098,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr "Editar camino de herradura"
@@ -14089,5 +14104,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr "Vía ciclable"
@@ -14097,5 +14112,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr "Editar vía ciclable"
@@ -14103,5 +14118,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr "Vía peatonal"
@@ -14110,5 +14125,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr "Editar vía peatonal"
@@ -14116,5 +14131,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr "Calle peatonal"
@@ -14123,5 +14138,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr "Editar una vía peatonal"
@@ -14129,5 +14144,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr "Escaleras"
@@ -14137,5 +14152,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr "Editar tramo de escaleras"
@@ -14144,5 +14159,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr "Pista"
@@ -14151,14 +14166,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr "Editar una pista"
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr "hormigón"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr "grava"
@@ -14166,18 +14181,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr "suelo"
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr "hierba"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr "arena"
@@ -14185,5 +14200,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr "Pista de grado 1 (pavimentada)"
@@ -14192,5 +14207,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr "Editar pista de grado 1 (pavimentada)"
@@ -14198,5 +14213,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr "Pista de grado 2 (de áridos o zahorra)"
@@ -14205,5 +14220,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr "Editar pista de grado 2 (de áridos o zahorra)"
@@ -14211,5 +14226,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr "Pista de grado 3 (de áridos con vegetación entre rodaduras)"
@@ -14218,5 +14233,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr "Editar pista de grado 3 (de áridos con vegetación entre rodaduras)"
@@ -14224,5 +14239,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr "Pista de grado 4 (de tierra con vegetación entre rodaduras)"
@@ -14231,5 +14246,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr "Editar pista de grado 4 (de tierra con vegetación entre rodaduras)"
@@ -14237,5 +14252,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr "Pista de grado 5 (con rodaduras apenas visibles entre la vegetación)"
@@ -14244,5 +14259,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -14252,5 +14267,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr "Camino"
@@ -14259,13 +14274,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr "Editar camino"
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr "Trineo"
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr "Esquí"
@@ -14273,5 +14288,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr "Sendero"
@@ -14281,5 +14296,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr "Editar sendero"
@@ -14287,5 +14302,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr "Sendero de montaña"
@@ -14295,5 +14310,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr "Editar sendero de montaña"
@@ -14301,5 +14316,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr "Sendero de montaña exigente"
@@ -14309,5 +14324,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Editar sendero de montaña exigente"
@@ -14315,5 +14330,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr "Sendero alpino"
@@ -14323,5 +14338,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr "Editar sendero alpino"
@@ -14329,5 +14344,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr "Sendero alpino exigente"
@@ -14337,5 +14352,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Editar sendero de montaña exigente"
@@ -14343,5 +14358,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr "Sendero alpino difícil"
@@ -14351,5 +14366,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Editar sendero alpino difícil"
@@ -14357,10 +14372,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr "Nodos de Vía"
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr "Salida de autopista"
@@ -14368,15 +14383,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr "Editar salida de autopista"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr "Número"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr "Servicios"
@@ -14384,5 +14399,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr "Editar estación de servicio"
@@ -14417,14 +14432,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr "Operador"
@@ -14433,5 +14448,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr "Semáforo"
@@ -14441,5 +14456,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr "Tipo de cruce peatonal"
@@ -14448,27 +14463,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr "sin supervisión"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr "semáforos"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr "isla"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr "sin marcar"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr "Cruce de caballos"
@@ -14476,6 +14491,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr "Cruce de bicicletas"
@@ -14484,11 +14499,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr "Guarda cruces"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr "Tipo de nombre de cruce (Reino Unido)"
@@ -14496,30 +14511,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr "cebra"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr "pelícano"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr "tucán"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr "frailecillo"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr "pegaso"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr "tigre"
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr "Stop"
@@ -14527,5 +14542,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr "Paso peatonal"
@@ -14534,14 +14549,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr "Editar cruce"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr "Tipo de nombre (Reino Unido)"
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr "mini-rotonda"
@@ -14552,14 +14567,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr "Dirección"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr "agujas del reloj"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr "Círculo de giro"
@@ -14569,20 +14584,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr "Límite de ciudad"
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr "Editar la señal de límite de ciudad"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr "Nombre alternativo"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr "Radar de tráfico"
@@ -14590,5 +14605,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr "Teléfono de emergencia"
@@ -14596,5 +14611,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr "Pendiente"
@@ -14602,5 +14617,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr "Pendiente pronunciada"
@@ -14609,10 +14624,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr "Vado"
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr "Editar vado"
@@ -14620,5 +14635,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr "Puerto de montaña"
@@ -14626,5 +14641,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr "Editar puerto de montaña"
@@ -14636,7 +14651,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr "Altitud"
@@ -14644,5 +14659,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr "Barreras"
@@ -14650,5 +14665,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr "Bolardo"
@@ -14656,5 +14671,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr "Editar un bolardo"
@@ -14693,18 +14708,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr "Tráfico permitido:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr "Barrera para bicicletas"
@@ -14713,5 +14732,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr "Bloques"
@@ -14719,5 +14738,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr "Barrera canadiense"
@@ -14725,10 +14744,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr "Editar barrera canadiense"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr "Trampa para coches"
@@ -14736,15 +14755,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr "Pinchos"
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr "Editar pinchos"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr "Cabina de peaje"
@@ -14752,5 +14771,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr "Editar cabina de peaje"
@@ -14758,10 +14777,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr "Aduana"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr "Editar aduana"
@@ -14771,5 +14790,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr "Seto"
@@ -14778,5 +14797,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr "Valla o cerca"
@@ -14785,5 +14804,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr "Muro"
@@ -14791,5 +14810,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr "Muralla"
@@ -14798,5 +14817,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr "Muro de contención"
@@ -14808,15 +14827,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr "Entrada"
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr "Editar una entrada"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr "Puerta"
@@ -14824,50 +14843,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr "Editar puerta"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr "Barrera"
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr "Editar una barrera"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr "Portilla de malla metálica"
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr "Editar portilla de malla metálica"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr "Banda reductora de velocidad"
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr "Editar banda reductora de velocidad"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr "Portilla giratoria"
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr "Editar portilla giratoria"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr "Escalera de paso"
@@ -14875,15 +14894,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr "Editar una escalera de paso"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+#, fuzzy
+msgid "Turnstile"
+msgstr "Plataforma de giro"
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "Editar una escalera de paso"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr "Poterna"
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr "Editar poterna"
@@ -14894,10 +14925,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr "Lámina de agua"
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr "Fuente"
@@ -14905,5 +14936,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr "Editar fuente"
@@ -14911,5 +14942,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr "Desagüe"
@@ -14917,10 +14948,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr "Editar canal de desagüe"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr "Riachuelo"
@@ -14928,10 +14959,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr "editar un riachuelo"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr "Canal"
@@ -14939,10 +14970,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr "Editar un canal"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr "Río"
@@ -14952,5 +14983,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr "Editar un río"
@@ -14958,15 +14989,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr "Editar lámina de agua"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr "Suelo"
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr "Editar suelo"
@@ -14974,15 +15005,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr "Cuenca"
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr "Editar cuenca"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr "Embalse"
@@ -14990,15 +15021,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr "Editar embalse"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr "Depósito de agua"
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr "Editar depósito de agua"
@@ -15006,5 +15037,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr "Ribera (para orillas de ríos anchos)"
@@ -15013,10 +15044,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr "Editar ribera"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr "Pantano"
@@ -15027,14 +15058,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr "Editar pantano"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr "Ciénaga"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr "ciénaga"
@@ -15048,35 +15079,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr "marísma"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr "juncal"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr "saladar"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr "superficie mareal"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr "manglar"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr "Lodazal"
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr "Editar lodazal"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr "Playa"
@@ -15084,20 +15115,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr "Editar playa"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr "Bahía"
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr "Editar bahía"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr "Acantilado"
@@ -15105,10 +15136,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr "Editar acantilado"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr "Línea de costa"
@@ -15116,5 +15147,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr "Editar línea de costa"
@@ -15122,5 +15153,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr "Ruta de ferry"
@@ -15128,5 +15159,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr "Editar una ruta de ferry"
@@ -15135,5 +15166,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr "Astillero"
@@ -15141,10 +15172,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr "Editar un astillero"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr "Muelle"
@@ -15152,5 +15183,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr "Editar un muelle"
@@ -15158,5 +15189,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr "Presa"
@@ -15164,15 +15195,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr "Editar una presa"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr "Nodo en vía fluvial"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr "Esclusa"
@@ -15181,5 +15212,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr "Represa"
@@ -15187,20 +15218,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr "Editar una represa"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr "Cascada"
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr "Editar una cascada"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr "Ensanche para giro"
@@ -15209,15 +15240,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr "Puerto deportivo"
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr "Editar puerto deportivo"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr "Embarcadero"
@@ -15225,10 +15256,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr "Editar embarcadero"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr "Terminal de ferry"
@@ -15236,10 +15267,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr "Editar la terminal de ferry"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr "Rampa"
@@ -15249,5 +15280,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr "Editar rampa"
@@ -15255,10 +15286,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr "Ferrocarril"
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr "Vía de tren"
@@ -15266,5 +15297,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr "Ediar vía de tren"
@@ -15294,8 +15325,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr "Tipos opcionales"
@@ -15309,35 +15340,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr "yarda"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr "vía muerta"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr "ramal"
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr "Vía estrecha"
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr "Editar vía estrecha"
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr "Monoraíl"
@@ -15345,45 +15376,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr "Editar monoraíl"
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr "Vía para tren histórico"
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr "Editar vía para tren histórico"
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr "Metro ligero"
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr "Editar metro ligero"
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr "Metro"
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr "Editar metro"
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr "Tranvía"
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr "Editar tranvía"
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr "Vía para autobús guiado"
@@ -15391,5 +15422,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr "Editar vía para autobús guiado"
@@ -15398,14 +15429,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr "Vía de tren en desuso"
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr "Editar vía de tren en desuso"
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr "Vía de tren abandonada"
@@ -15414,5 +15445,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr "Paso a nivel"
@@ -15421,5 +15452,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr "Paso a nivel peatonal"
@@ -15429,5 +15460,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr "Tipo de paso"
@@ -15435,5 +15466,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr "Plataforma de giro"
@@ -15442,10 +15473,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr "Remonte"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr "Telesilla"
@@ -15453,10 +15484,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr "Editar telesilla"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr "Telearrastre"
@@ -15464,10 +15495,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr "Editar telearrastre"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr "Telecabina"
@@ -15475,10 +15506,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr "Ediatr telecabina"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr "Góndola"
@@ -15486,5 +15517,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr "Editar góndola"
@@ -15492,5 +15523,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr "Estación"
@@ -15501,10 +15532,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr "Editar Estación"
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr "Gasolinera"
@@ -15514,5 +15545,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr "Ediatr gasolinera"
@@ -15528,5 +15559,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15536,5 +15567,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr "Editar aparcamiento"
@@ -15542,41 +15573,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr "Capacidad (Coches)"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr "al aire libre"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr "de pisos"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr "subterráneo"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr "estacionamientos Park and Ride"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr "Plazas para Personas de Movilidad Reducida"
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr "De pago"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr "Limpieza"
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr "Editar lavado de vehículos"
@@ -15584,5 +15615,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr "Concesionario"
@@ -15590,15 +15621,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr "Editar concesionario de automóviles"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr "Taller"
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr "Editar reparación de automóviles"
@@ -15606,5 +15637,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr "Alquiler"
@@ -15613,10 +15644,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr "Editar alquiler de automóviles"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr "Compartido"
@@ -15624,5 +15655,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr "Editar automóviles compartidos"
@@ -15630,5 +15661,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr "Editar aparcamiento para bicicletas"
@@ -15637,5 +15668,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr "Editar alquiler de bicicletas"
@@ -15644,15 +15675,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr "Editar tienda de bicicletas"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "Transporte público"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr "UIC-Referencia"
@@ -15660,5 +15691,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr "Apeadero de ferrocarril"
@@ -15666,5 +15697,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr "Editar apeadero"
@@ -15672,5 +15703,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr "Parada de tranvía"
@@ -15679,5 +15710,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr "Editar parada de tranvía"
@@ -15685,5 +15716,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr "Andén de ferrocarril"
@@ -15692,5 +15723,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr "Editar andén de ferrocarril"
@@ -15702,5 +15733,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr "Referencia (número de pista)"
@@ -15708,10 +15739,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr "Área"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr "Boca de metro"
@@ -15720,10 +15751,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr "Editar boca de metro"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr "Silla de ruedas"
@@ -15732,5 +15763,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr "Estación de autobús"
@@ -15739,5 +15770,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr "Editar estación de autobús"
@@ -15745,5 +15776,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr "Parada de autobús"
@@ -15753,5 +15784,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr "Editar parada de autobús"
@@ -15762,6 +15793,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr "Refugio"
@@ -15769,10 +15800,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr "Andén de autobús"
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr "Editar andén de autobús"
@@ -15780,5 +15811,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr "Taxi"
@@ -15786,5 +15817,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr "Editar parada de taxi"
@@ -15792,5 +15823,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr "Aeropuerto"
@@ -15798,15 +15829,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr "Editar Aeropuerto"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr "ICAO"
@@ -15815,5 +15846,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr "Alojamiento"
@@ -15825,5 +15856,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -15832,15 +15863,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr "Editar hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr "Estrellas"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr "Motel"
@@ -15848,20 +15879,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr "Editar motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr "Pensión"
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr "Editar pensión"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr "Chalet"
@@ -15869,10 +15900,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr "Editar chalet"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr "Albergue"
@@ -15880,30 +15911,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr "Editar albergue"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr "Cabaña alpina"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr "Editar cabaña alpina"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr "Zona de caravanas"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr "Editar zona de caravanas"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr "Lugar de acampada"
@@ -15911,10 +15942,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr "Editar lugar de acampada"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "Comida+Bebidas"
@@ -15925,5 +15956,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurante"
@@ -15931,5 +15962,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr "Editar restaurante"
@@ -15937,5 +15968,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr "Cocina"
@@ -15943,61 +15974,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr "italiano"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr "chino"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr "pizzería"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr "hamburguesería"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr "griego"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr "alemán"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr "india"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr "turco"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr "asiático"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr "tailandés"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr "mexicano"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr "japonés"
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr "Establecimiento de comida rápida"
@@ -16005,9 +16036,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr "Editar establecimiento de comida rápida"
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr "Cafetería"
@@ -16015,10 +16046,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr "Editar cafetería"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr "Bar"
@@ -16026,20 +16057,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr "Editar bar"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr "Editar biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr "Bar"
@@ -16047,10 +16078,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr "Editar Bar"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr "Club nocturno"
@@ -16058,20 +16089,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr "Editar club nocturno"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr "Atracción"
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr "Editar atracción"
@@ -16080,11 +16111,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr "Horario de apertura"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "Museo"
@@ -16092,10 +16123,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr "Editar museo"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "Zoo"
@@ -16104,10 +16135,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr "Editar zoo"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr "Panorámica"
@@ -16115,25 +16146,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr "Editar panorámica"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr "Torre de vigía"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr "Parque temático"
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr "Editar parque temático"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr "Trabajo artístico"
@@ -16141,5 +16172,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr "Editar trabajo artístico"
@@ -16147,5 +16178,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr "Oficina de información"
@@ -16153,80 +16184,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr "Editar oficina de información"
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr "Tipo de Mapa"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr "mapa"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr "callejero"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr "topoguía"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr "mapa ciclable"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
 msgid "Closer Description"
 msgstr "Descripción detallada"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1701
 msgid "Information Board"
 msgstr "Panel informativo"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Board Type"
 msgstr "Tipo de Cartel"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "board"
 msgstr "cartel"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "history"
 msgstr "historia"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "nature"
 msgstr "naturaleza"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "wildlife"
 msgstr "vida salvaje"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Guidepost (Hiking)"
 msgstr "Hito direccional (excursionismo)"
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr "Otros Puntos de Información"
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr "Editar refugio"
@@ -16234,25 +16265,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr "Barbacoa"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr "Zona de picnic"
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr "Editar zona de picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "Lugares históricos"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "Castillo"
@@ -16261,20 +16292,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr "Editar castillo"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "Ruinas"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr "Editar ruinas"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr "Lugar arqueológico"
@@ -16283,10 +16314,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr "Editar lugar arqueológico"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr "Campo de batalla"
@@ -16294,5 +16325,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr "Editar campo de batalla"
@@ -16300,15 +16331,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr "Monumento"
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr "Editar monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr "Monumento conmemorativo"
@@ -16316,45 +16347,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr "Editar monumento conmemorativo"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr "Crucero"
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr "Editar crucero"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr "Humilladero"
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr "Editar humilladero"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "Ocio"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr "Parque acuático"
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr "Editar parque acuático"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "Zona de juegos"
@@ -16362,15 +16393,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr "Editar zona de juegos"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "Pesca"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr "Editando pesca"
@@ -16378,15 +16409,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr "Instalaciones deportivas"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "Estadio"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr "Editar estadio"
@@ -16400,6 +16431,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "seleccionar deporte:"
@@ -16422,4 +16453,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -16480,5 +16519,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16488,5 +16535,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16632,5 +16679,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16736,5 +16783,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16775,29 +16822,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr "deporte"
@@ -16807,227 +16855,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr "diversos"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr "tiro con arco"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr "atletismo"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr "fútbol australiano"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr "béisbol"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr "baloncesto"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr "bolos"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr "piragua"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr "escalada"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr "Cricket con redes"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr "carrera de perros"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr "hípica"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr "fútbol"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr "gimnasia"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr "carrera de caballos"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr "pelota vasca"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr "raqueta"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr "monopatín"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr "patinaje"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr "esquí"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "Fútbol"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr "natación"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "tenis de mesa"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr "Polideportivo"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr "Editar polideportivo"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr "Campo de juego"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr "Editar campo de juego"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr "Pista de carreras"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr "Editar pista de carreras"
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr "Campo de golf"
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr "Editar campo de golf"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr "Editar mini golf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr "Deporte"
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr "Multi"
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr "Editar multi"
@@ -17066,191 +17114,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr "campo de juego"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr "Polideportivo"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr "Estadio"
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr "Editar bowling"
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr "Atletismo"
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr "Editar atletismo"
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr "Tiro con arco"
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr "Editar tiro con arco"
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr "Alpinismo"
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr "Editar alpinismo"
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr "Piragüismo"
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr "Editar piragüismo"
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr "Ciclismo"
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr "Editar ciclismo"
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr "Carreras de perros"
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr "Editar carreras de perros"
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr "Hípica"
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr "Editar hípica"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr "Carreras de caballos"
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr "Editar carreras de caballos"
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr "Gimnasia"
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr "Editar gimnasia"
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr "Deportes de motor"
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr "Editar deportes de motor"
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr "Patinaje"
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr "Editar patinaje"
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr "Monopatín"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr "Editar monopatín"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr "Natación"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr "Editar natación"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr "Esquí"
@@ -17258,56 +17306,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr "Editar esquí"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr "Tipo de pista de esquí"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr "de descenso"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr "nórdico"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr "parque de snowboard"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr "Dificultad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr "novato"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr "fácil"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr "intermedio"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr "avanzado"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr "experto"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr "fuera de pista"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr "Tiro"
@@ -17315,178 +17363,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr "Editar tiro"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr "Deporte (Pelota)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr "Fútbol"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr "Editar fútbol"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr "Fútbol americano"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr "Editar fútbol americano"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr "Fútbol australiano"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr "Editar fútbol australiano"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr "Béisbol"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr "Editar béisbol"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr "Baloncesto"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr "Editar baloncesto"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr "Editar golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr "campo de golf"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr "Editar boule"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr "Bolos"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr "Editar bolos"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr "Edit cricket"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr "Cricket con redes"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr "Editar cricket con redes"
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr "Editar croquet"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr "Editar hockey"
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr "Pelota vasca"
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr "Editar pelota vasca"
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr "Raqueta"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr "Editar raqueta"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr "Editar rugby"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr "Ping-pong"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr "Editar ping-pong"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr "Editar tenis"
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "Edificios"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr "Edificio"
@@ -17494,5 +17542,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "Edificio público"
@@ -17500,10 +17548,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr "Editar edificio público"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "Ayuntamiento"
@@ -17511,10 +17559,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "Editar ayuntamiento"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "Embajada"
@@ -17522,10 +17570,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "Editar embajada"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "Juzgado"
@@ -17534,10 +17582,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "Editar juzgado"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "Prisión"
@@ -17546,10 +17594,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "Editar prisión"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "Policía"
@@ -17559,10 +17607,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "Editar policía"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "Parque de bomberos"
@@ -17571,10 +17619,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "Editar parque de bomberos"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "Oficina postal"
@@ -17582,5 +17630,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr "Editar oficina postal"
@@ -17588,15 +17636,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr "Jardín de infancia"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr "Editar jardín de infancia"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "Escuela"
@@ -17604,10 +17652,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "Editar escuela"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr "Universidad"
@@ -17615,10 +17663,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr "Editar universidad"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr "Instituto de enseñanza secundaria"
@@ -17626,5 +17674,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr "Editar instituto de enseñanza secundaria"
@@ -17632,5 +17680,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "Cine"
@@ -17639,10 +17687,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "Editar cine"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "Biblioteca"
@@ -17651,10 +17699,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "Editar biblioteca"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr "Centro de arte"
@@ -17662,10 +17710,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr "Editar centro de arte"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "Teatro"
@@ -17674,10 +17722,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "Editar teatro"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr "Lugar de culto"
@@ -17687,5 +17735,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr "Editar lugar de culto"
@@ -17694,6 +17742,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr "Religión"
@@ -17702,66 +17750,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr "bahaísta"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr "budista"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr "cristiana"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr "hindú"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr "jainista"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr "judía"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr "musulmana"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr "sijista"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr "espiritualista"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr "taoista"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr "unitarismo"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr "zoroástrica"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr "Confesión"
@@ -17770,81 +17818,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr "anglicano"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr "baptista"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr "católico"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr "evangélico"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr "testigos de Jehová"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr "luterano"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr "mormón"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr "ortodoxo"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr "presbiteriano"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr "cuáquero"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr "chiita"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr "suní"
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr "Direcciones"
@@ -17853,5 +17901,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr "Editar direcciones"
@@ -17859,5 +17907,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr "Número de portal"
@@ -17865,20 +17913,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr "Nombre del edificio"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr "Nombre de la ciudad"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "Código postal"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr "Código del país"
@@ -17886,5 +17934,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr "Direcciones interpoladas"
@@ -17893,5 +17941,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr "Editar direcciones interpoladas"
@@ -17899,71 +17947,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr "Esquema numérico"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr "impares"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr "pares"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr "todos"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr "alfabético"
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr "Construcciones"
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr "Fábrica"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr "Editar fábrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "Torre"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "Editar torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "Torre de agua"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "Editar torre de agua"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr "Gasómetro"
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr "Editar gasómetro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "Faro"
@@ -17971,10 +18019,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "Editar faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "Molino de viento"
@@ -17982,10 +18030,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "Editar molino de viento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "Tubería"
@@ -17993,10 +18041,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "Editar tubería"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr "Depuradora"
@@ -18006,10 +18054,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr "Editar depuradora"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr "Grúa"
@@ -18017,10 +18065,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr "Editar grúa"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr "Baliza"
@@ -18028,10 +18076,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr "Editar baliza"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr "Vértice geodésico"
@@ -18039,10 +18087,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr "Editar vértice geodésico"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr "Cámara de vigilacia"
@@ -18050,5 +18098,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr "Editar cámara de vigilancia"
@@ -18056,5 +18104,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr "Generador de energía"
@@ -18064,39 +18112,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr "Editar generador de energía"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr "eólico"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr "hidráulico"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr "fósil"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr "carbón"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr "gas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr "Central eléctrica"
@@ -18105,10 +18153,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr "Editar central eléctrica"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr "Subestación eléctrica"
@@ -18117,5 +18165,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr "Editar subestación eléctrica"
@@ -18123,10 +18171,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr "Línea de referencia"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr "Torre de electricidad"
@@ -18137,5 +18185,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr "Editar torre de electricidad"
@@ -18143,5 +18191,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr "Tendido eléctrico"
@@ -18150,25 +18198,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr "Editar tendido eléctrico"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr "Voltaje"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr "Número de cables"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr "Servicios"
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "Baños"
@@ -18176,20 +18224,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr "Número de referencia"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr "Buzón de correos"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "Teléfono"
@@ -18198,5 +18246,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr "Editar teléfono"
@@ -18204,5 +18252,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "Monedas"
@@ -18210,5 +18258,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr "Billetes"
@@ -18216,5 +18264,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr "Tarjetas de recarga y monederos electrónicos"
@@ -18222,5 +18270,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr "Tarjetas de débito"
@@ -18228,15 +18276,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "Tarjetas de crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "Tarjetas telefónicas"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr "Reciclaje"
@@ -18245,5 +18293,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr "Editar punto limpio"
@@ -18251,35 +18299,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr "Baterías"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr "Envases"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr "Ropas"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr "Vidrio"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr "Chatarra"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr "Banco"
@@ -18288,20 +18336,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr "Apostadero de caza"
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr "Editar apostadero de caza"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr "Oculto"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr "Esclusa"
@@ -18309,22 +18357,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr "Altura"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr "profundidad"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr "media"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr "total"
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr "Fuente"
@@ -18333,10 +18381,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr "Editar fuente"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "Agua potable"
@@ -18345,10 +18393,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "Editar agua potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr "Caja tibia"
@@ -18356,25 +18404,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr "Editar caja tibia"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "Tiendas"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr "Supermercado"
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr "Editar supermercado"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr "Tienda de alimentación"
@@ -18382,10 +18430,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr "Editar tienda de alimentación"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr "Kiosko"
@@ -18393,10 +18441,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr "Editar kiosko"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "Máquina expendedora"
@@ -18404,5 +18452,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "Editar máquina expendedora"
@@ -18410,88 +18458,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "Expendedor automático de productos"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr "billetes de de transporte público"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr "abonos de transporte público"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr "billetes de aparcamiento"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr "Alimentación"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "Bebidas"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr "Caramelos"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr "Estanco"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr "fotos"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr "comida para animales"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "Periódicos"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "juguetes"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr "sellos"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "Tarjetas SIM"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr "Tarjetas telefónicas"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr "Bonos"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr "condones"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr "tampones"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr "Bolsas para excrementos"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr "Tarjetas de fidelización o descuento"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "Carnicería"
@@ -18499,10 +18547,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "Editar carnicería"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "Panadería"
@@ -18510,10 +18558,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "Editar panadería"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr "Floristería"
@@ -18521,20 +18569,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr "Editar floristería"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr "Tienda de productos orgánicos"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr "Editar tienda de productos orgánicos"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr "Tienda de bebidas alcohólicas"
@@ -18542,60 +18590,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr "Editar tienda de bebidas alcohólicas"
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr "Bebidas"
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr "Editar tienda de bebidas"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr "Computador"
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr "Editar tienda de computadores"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr "Electrónica"
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr "Editar tienda de electrónica"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr "Editar Tienda Hifi"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr "Muebles"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr "Editar mueblería"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr "Centro de jardinería"
@@ -18603,10 +18651,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr "Editar centro de jardinería"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr "Hardware"
@@ -18614,10 +18662,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr "Editar almacén de hardware"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr "Almacén de bricolaje"
@@ -18625,60 +18673,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr "Editar almacén de bricolaje"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr "Papelería"
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr "Editar papelería"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr "Peluquería"
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr "Editar peluquería"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr "Zapatos"
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr "Editar zapatería"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr "Juguetes"
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr "Editar juguetería"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr "Video"
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr "Editar tienda de videos"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "Tintorería"
@@ -18686,10 +18734,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "Editar tintorería"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "Lavandería"
@@ -18697,10 +18745,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "Editar lavandería"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr "Tienda de actividades al aire libre"
@@ -18708,35 +18756,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr "Editar tienda de actividades al aire libre"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr "Deportes"
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr "Editar tienda de material de deportes"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr "Óptica"
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr "Editar óptica"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "Dinero en efectivo"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "Banco"
@@ -18744,5 +18792,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "Editar banco"
@@ -18750,10 +18798,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "Cajero automático"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr "Cambio de moneda"
@@ -18761,5 +18809,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr "Editar cambio de moneda"
@@ -18767,15 +18815,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "Editar cajero automático"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "Centro médico"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr "Médico"
@@ -18783,20 +18831,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr "Editar médico"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr "Editar dentista"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "Farmacia/Parafarmacia"
@@ -18804,5 +18852,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "Editar farmacia/parafarmacia"
@@ -18810,10 +18858,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr "Expende con receta médica"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "Hospital"
@@ -18821,10 +18869,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "Editar hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr "Punto de acceso para emergencias"
@@ -18833,5 +18881,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr "Editar punto de acceso para emergencias"
@@ -18840,20 +18888,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr "Número de punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr "Nombre del Punto"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr "Número de teléfono"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utilizar código internacional, como +12-345-67890)"
@@ -18861,5 +18909,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -18868,56 +18916,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr "Editar veterinario"
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr "Continente"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr "Editar continente"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr "País"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr "Editar país"
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr "Estado/Provincia"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr "Editar estado/provincia"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr "Región"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr "Editar región"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr "Municipio"
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr "Editar municipio"
@@ -18925,15 +18972,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr "Ciudad (>100.000 hab.)"
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr "Editar ciudad (>100.00 hab.)"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr "Ciudad (10.000 - 100.000 hab.)"
@@ -18941,10 +18988,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr "Editar ciudad (10.000 - 100.000 hab.)"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr ""
@@ -18954,5 +19001,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr ""
@@ -18961,15 +19008,15 @@
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "Población (< 10.000 hab.)"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "Editar población (< 10.000 hab.)"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr ""
@@ -18977,5 +19024,5 @@
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr ""
@@ -18985,5 +19032,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr "Paraje"
@@ -18991,10 +19038,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr "Editar paraje"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "Isla"
@@ -19002,5 +19049,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "Editar isla"
@@ -19008,5 +19055,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr "Entrada de cueva"
@@ -19014,10 +19061,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr "Editar entrada de cueva"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "Pico"
@@ -19025,10 +19072,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "Editar pico"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr "Glaciar"
@@ -19036,10 +19083,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr "Editar glaciar"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr "Volcán"
@@ -19047,70 +19094,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr "Editar volcán"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr "Fronteras"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr "Nacional"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr "Editar frontera nacional"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr "Administrativa"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr "Editar frontera administrativa"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr "Civil"
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr "Editar frontera civil"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr "Político"
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr "Editar frontera política"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr "Parque Nacional"
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr "Editar límites del parque nacional"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr "Uso del suelo"
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "Árbol"
@@ -19119,15 +19166,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "Editar árbol"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr "Nombre botánico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr "Bosque"
@@ -19136,5 +19183,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr "Editar bosque"
@@ -19142,17 +19189,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr "conífera"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr "caducifolio"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr "mixto"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "Plantación forestal"
@@ -19161,14 +19208,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr "Editar zona forestal"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr "Reserva natural"
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr "Editar reserva natural"
@@ -19176,25 +19223,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr "Pedregal"
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr "Editar pedregal"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr "Matorral"
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr "Editar matorral"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr "Braña"
@@ -19202,10 +19249,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr "Editar braña"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr "Brezal o landa"
@@ -19213,5 +19260,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr "Editar brezal o landa"
@@ -19219,5 +19266,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr "Edificio agrario"
@@ -19226,45 +19273,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr "Editar edificio agrario"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr "Tierra de labranza"
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr "Editar tierra de labranza"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr "Prado"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr "Editar prado"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr "Viñedo"
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr "Editar viñedo"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr "Huertos de ocio"
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr "Editar zona de huertos de ocio"
@@ -19272,25 +19319,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr "Jardín"
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr "Editar jardín"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr "Pastizal"
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr "Editar pastizal"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr "Parque municipal"
@@ -19298,10 +19345,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr "Editar parque municipal"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr "Espacio de uso común (plazas, alamedas, bulevares, etc.)"
@@ -19309,20 +19356,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr "Editar espacio de uso común"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr "Parque"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr "Editar parque"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr "Área de esparcimiento"
@@ -19330,5 +19377,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr "Editar área de esparcimiento"
@@ -19336,15 +19383,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr "Área residencial"
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr "Editar suelo residencial"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr "Cementario"
@@ -19352,9 +19399,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr "Editar cementerio"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr "Cementerio"
@@ -19362,39 +19409,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr "Editar cementerio"
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr "Comercios"
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr "Editar comercios"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr "Oficinas"
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr "Editar oficinas"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr "Editar suelo industrial"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr "Zona ferroviaria"
@@ -19402,15 +19449,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr "Editar zona ferroviaria"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr "Militar"
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr "Editar área militar"
@@ -19418,55 +19465,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr "Zona en construcción"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr "Editar zona en construcción"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr "Baldío"
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr "Editar terreno baldío"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr "Suelo en construcción"
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr "Editar suelo en contrucción"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr "Vertedero"
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr "Editar vertedero"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr "Cantera"
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr "Editar cantera"
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr "Multipolígono"
@@ -19476,5 +19523,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr "Editar multipolígono"
@@ -19483,10 +19530,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr "segmento exterior"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr "segmento interior"
@@ -19494,5 +19541,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr "Restricción de giro"
@@ -19501,5 +19548,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr "Editar restricción de giro"
@@ -19507,34 +19554,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr "Restricción"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr "prohibido girar a la izquierda"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr "prohibido girar a la derecha"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr "prohibido continuar recto"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr "prohibido giro en U"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr "solo giro a la derecha"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr "solo giro a la izquierda"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr "solo recto"
@@ -19543,15 +19590,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr "desde la vía"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr "a través de nodo o vía"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr "a la vía"
@@ -19559,5 +19606,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr "Ruta"
@@ -19566,5 +19613,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr "Editar ruta"
@@ -19572,5 +19619,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr "Tipo de ruta"
@@ -19642,24 +19689,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr "bicicleta"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr "carretera"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr "ski"
@@ -19712,20 +19759,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr "pie"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr "senderismo"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr "tranvía"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr "desvío"
@@ -19739,10 +19786,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr "Descripción del símbolo"
@@ -19750,26 +19797,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr "Red"
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "Tipo de ruta"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr "Propuesto"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr "Suplente"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr "temporal"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr "Conexión"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr "Color (hex)"
@@ -19778,30 +19831,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr "segmento de la ruta"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr "segmento siguiente"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr "segmento anterior"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr "punto de detención"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr "próximo punto de parada"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr "anterior punto de parada"
@@ -19837,6 +19890,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19852,5 +19906,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19869,5 +19931,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr "estándar"
@@ -19961,7 +20023,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr "puente"
@@ -20226,15 +20288,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr "obsoleto"
@@ -20276,5 +20338,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr "caballo"
@@ -20412,4 +20474,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20421,5 +20489,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20427,5 +20495,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20462,5 +20530,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20484,11 +20552,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr "barrera"
@@ -20512,5 +20580,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20551,5 +20619,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20587,6 +20655,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr "calle"
@@ -20642,7 +20710,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr "pista"
@@ -20695,11 +20763,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr "ferrocarril"
@@ -20720,5 +20796,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr "servicios"
@@ -20732,5 +20808,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr "vado"
@@ -20751,5 +20827,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr "círculo de giro"
@@ -20763,6 +20839,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr "Punto de acceso de emergencias"
@@ -20777,5 +20853,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr "ribera"
@@ -20789,5 +20865,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr "arroyo"
@@ -20801,5 +20877,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr "muelle"
@@ -20827,5 +20903,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr "acueducto"
@@ -20968,5 +21044,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20993,13 +21069,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr "hecho por el hombre"
@@ -21061,7 +21137,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr "punto ferroviario"
@@ -21084,10 +21160,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr "otros ferrocarriles"
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr "paso con más de un cruce ferroviario"
@@ -21123,7 +21199,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr "vía muerta"
@@ -21168,6 +21244,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr "aerovía"
@@ -21181,5 +21257,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr "terminal"
@@ -21201,5 +21277,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr "pista (oscuro)"
@@ -21213,5 +21289,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr "pista (claro)"
@@ -21219,4 +21295,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21259,7 +21342,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr "pista de rodadura"
@@ -21276,5 +21359,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr "pista fácil"
@@ -21289,5 +21372,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr "pista intermedia"
@@ -21302,5 +21385,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr "pista avanzada"
@@ -21315,5 +21398,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr "pista para expertos"
@@ -21328,5 +21411,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr "pista de estilo libre"
@@ -21341,5 +21424,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr "pista para iniciados"
@@ -21362,4 +21445,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -21370,4 +21460,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -21444,10 +21542,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr "energía"
@@ -21461,5 +21560,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr "muelle"
@@ -21473,5 +21572,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr "tubería"
@@ -21599,12 +21698,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr "ocio"
@@ -21618,5 +21717,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr "puerto deportivo"
@@ -21688,8 +21787,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr "servicios"
@@ -21791,10 +21890,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr "tráfico de ocio"
@@ -21814,4 +21913,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21833,4 +21939,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -22154,4 +22267,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -22178,24 +22299,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr "equipamiento lumínico"
@@ -22227,6 +22356,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr "agua (claro)"
@@ -22287,8 +22416,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr "salud"
@@ -22641,26 +22770,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr "tienda"
@@ -22715,5 +22844,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22732,8 +22861,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr "hotel"
@@ -22883,9 +23012,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr "turismo"
@@ -22957,8 +23086,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr "patrimonio histórico"
@@ -23029,8 +23158,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr "zona verde"
@@ -23044,5 +23173,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr "cantera"
@@ -23056,5 +23185,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr "vertedero"
@@ -23076,5 +23205,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr "cuenca"
@@ -23088,5 +23217,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr "plantación forestal"
@@ -23100,5 +23229,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr "edificio agrario"
@@ -23121,5 +23250,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr "venta al por menor"
@@ -23133,5 +23262,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr "industrial"
@@ -23145,5 +23274,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr "área postindustrial degradada"
@@ -23157,5 +23286,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr "área rururbana"
@@ -23169,5 +23298,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr "zona ferroviaria"
@@ -23224,7 +23353,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr "zona militar"
@@ -23238,5 +23367,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr "cementerio"
@@ -23249,5 +23378,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr "pico"
@@ -23262,5 +23391,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr "glaciar"
@@ -23274,5 +23403,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr "volcán"
@@ -23327,8 +23456,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr "espacio natural"
@@ -23342,5 +23471,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr "matorral"
@@ -23354,5 +23483,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr "monte"
@@ -23366,5 +23495,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr "bosque"
@@ -23378,5 +23507,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr "lodazal"
@@ -23390,5 +23519,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr "playa"
@@ -23466,8 +23595,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr "ruta"
@@ -23515,7 +23644,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr "frontera"
@@ -23657,10 +23786,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr "lugar"
@@ -23708,6 +23837,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr "dirección"
@@ -24004,18 +24133,9 @@
 msgstr "Terraserver Urban"
 
+#~ msgid "Move"
+#~ msgstr "Mover"
+
 #~ msgid "Unknown file extension."
 #~ msgstr "Extensión de archivo desconocida."
-
-#~ msgid "Move"
-#~ msgstr "Mover"
-
-#~ msgid "Invalid projection"
-#~ msgstr "Proyección inválida"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Cambia la proyección a {0} previamente."
-
-#~ msgid "end"
-#~ msgstr "fin"
 
 #~ msgid "Email"
@@ -24201,4 +24321,7 @@
 #~ msgid "Adjust the position of the WMS layer"
 #~ msgstr "Ajustar la posición de la capa WMS"
+
+#~ msgid "end"
+#~ msgstr "fin"
 
 #~ msgid "image not loaded"
@@ -24397,4 +24520,7 @@
 #~ msgstr "Deportes"
 
+#~ msgid "Invalid projection"
+#~ msgstr "Proyección inválida"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Editar un puente levadizo"
@@ -24405,4 +24531,7 @@
 #~ msgid "The following errors occured during mass download:"
 #~ msgstr "Se han producido los siguientes errores durante la descarga masiva:"
+
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Cambia la proyección a {0} previamente."
 
 #~ msgid "Oberpfalz Geofabrik.de"
Index: /applications/editors/josm/i18n/po/et.po
===================================================================
--- /applications/editors/josm/i18n/po/et.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/et.po	(revision 17069)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
-"PO-Revision-Date: 2009-08-10 09:22+0000\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
+"PO-Revision-Date: 2009-08-10 20:00+0000\n"
 "Last-Translator: Margus Värton <margus@dakar.ee>\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: 2009-08-10 11:57+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -56,6 +56,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -100,6 +100,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "Viga"
@@ -110,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "Salvestamata muudatused"
@@ -128,10 +128,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -148,15 +148,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -186,6 +186,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -215,5 +215,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -361,15 +361,15 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Please select the target layer."
-msgstr ""
+msgstr "Palun vali sihtkiht."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 msgid "Select target layer"
-msgstr ""
+msgstr "Vali sihtkiht"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
-msgstr ""
+msgstr "Ühenda"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -382,5 +382,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 msgid "No target layers"
-msgstr ""
+msgstr "Sihtkihte ei ole"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
@@ -451,9 +451,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -486,7 +486,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -567,37 +567,37 @@
 msgstr "{0} sõlme tees {1} ületab suurima lubatud sõlmede arvu {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "andmed"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "kiht"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "valik"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "allalaetule"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Suumi {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Suumi vaade {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -607,30 +607,30 @@
 msgstr "Vaade: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "Ei ole valitud midagi, millele suumida"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "Ei ole vastuolusid, millele suumida"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "Sobita tee"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "Sobita mitu teed üheks."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "Palun vali vähemalt kaks teed, mida sobitada."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr "Sobita erinevate kuuluvustega teed?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -639,13 +639,13 @@
 "Valitud teedel on erinevad kuuluvusseosed. Kas Sa oled sobitamises kindel?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "Sobita ikkagi."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "Muuda suundi?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -655,10 +655,10 @@
 "pöörata?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "Pööra ja sobita."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -666,20 +666,20 @@
 msgstr "Sisesta kõigi vastuolude kohta väärtused."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Lahenda vastuolud."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Ühenda {0} teed."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "Kõik teed olid tühjad."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -724,6 +724,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -745,6 +745,6 @@
 msgstr "Kustuta valitud objektid."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -754,5 +754,5 @@
 msgstr "Ülekirjutamine"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -823,5 +823,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
 msgid "Conflicts during download"
-msgstr ""
+msgstr "Konfliktid allalaadimisel"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -884,7 +884,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "Ekspordi andmed GPX faili."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -900,5 +899,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -916,5 +915,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -986,22 +985,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "Liida sõlmed."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "Liida sõlmed vanimaks."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "Palun vali vähemalt kaks sõlme mida liita."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr "Liida erineva kuuluvusega sõlmed?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1009,13 +1008,13 @@
 msgstr "Valitud sõlmedel on erinevad seosed. Liida need ikkagi?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "Liida igal juhul."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "Ei saa sõlmi liita: tuleb kustutada tee, mis on endiselt kasutusel."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1269,7 +1268,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "Ühtegi dokumenti pole avatud! Midagi pole salvestada."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1865,5 +1863,5 @@
 msgstr "Viga allaladimise ajal"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1875,5 +1873,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr "Kustutatud või nihutatud primitiivid"
@@ -1910,11 +1908,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2053,5 +2051,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2122,5 +2120,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Otsi objekte."
@@ -2244,5 +2242,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Otsi"
@@ -2440,5 +2438,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2479,5 +2477,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr ""
@@ -2514,9 +2512,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "Sulanda {0} sõlm(e)"
-msgstr[1] "Sulanda {0} sõlm(e)"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2552,9 +2550,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "{0} punkt"
-msgstr[1] "{0} punkti"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2716,7 +2714,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "Muuda {0} objekt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2726,5 +2724,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2771,5 +2769,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2802,5 +2800,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2814,5 +2812,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr ""
@@ -2827,5 +2825,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3104,5 +3102,5 @@
 msgstr "Rohkem ei näidata"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3111,5 +3109,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3119,10 +3117,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr "Eelitingimuste rikkumine"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3130,25 +3128,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "tundmatu"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3158,9 +3156,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3169,9 +3167,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "Ootamatu erandolukord"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3181,9 +3191,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "Tundmatu host"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3193,5 +3203,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr "Primitiiv on juba kustutatud"
@@ -3281,10 +3291,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "Kasutajanimi"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "Salasõna"
@@ -3486,15 +3496,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "kiht ei ole nimekirjas"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3548,5 +3558,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr ""
@@ -3555,5 +3565,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr ""
@@ -3562,20 +3572,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3585,6 +3595,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3592,6 +3602,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3599,40 +3609,40 @@
 msgstr "Liikmed"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3640,74 +3650,74 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3715,30 +3725,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3746,5 +3756,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3752,13 +3762,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3766,5 +3776,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3772,21 +3782,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3795,27 +3805,27 @@
 msgstr "Eemalda"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3823,5 +3833,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3830,5 +3840,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3837,5 +3847,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3844,5 +3854,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -3851,21 +3861,21 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -3875,5 +3885,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -3883,5 +3893,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -3889,19 +3899,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -3910,19 +3920,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -3931,9 +3941,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -3943,13 +3953,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -3957,90 +3967,90 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4050,17 +4060,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4069,14 +4079,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4084,21 +4094,21 @@
 msgstr "Roll"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4106,14 +4116,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4121,7 +4131,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4133,7 +4143,7 @@
 msgstr "Võti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4146,45 +4156,45 @@
 msgstr "Väärtus"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr ""
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4204,8 +4214,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4242,5 +4252,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4343,83 +4353,83 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "Kihid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "Ava kõikide laetud kihtide nimekiri."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "Kustuta valitud kiht"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "Näita/Peida"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "Muuda valitud kihi nähtavust."
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "Liiguta valitud kiht ühe rea võrra üles."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "Liiguta valitud kiht ühe rea võrra alla."
@@ -4429,6 +4439,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4437,22 +4447,22 @@
 msgstr[1] "See muudab kuni {0} objekti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "Tühi väärtus kustutab võtme."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<erinev>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "Muuta väärtusi?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4460,5 +4470,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4467,40 +4477,40 @@
 msgstr[1] "Muuda kuni {0} objekti seadeid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "Palun vali võti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "Palun vali väärtus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 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/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "Seaded/Liikmelisus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "Valitud objektide seaded"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "On liikmeks järgnevas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "Lisa seaded"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4517,39 +4527,39 @@
 msgstr "Lisa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 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/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "Seadete muutmine"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 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/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Seaded: {0} / Liikmelisus: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "Seaded / Liikmelisus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "Muuda seost"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Tõesti soovid kustutada valikut seosest {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "Kustuta valitud võti kõkides objektides"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "Kustuda seadeid"
@@ -4561,5 +4571,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "Seosed"
@@ -4591,31 +4601,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "Praegune valik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "Ava valiku nimekirja aken."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "Suurenda valitud elementidele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "Värskenda valikute nimekirja."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "Suurenda valikule"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Valik: Suhted:{0} / Teed:{1} / Punktid:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4623,5 +4633,5 @@
 msgstr "Valik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4630,5 +4640,5 @@
 msgstr[1] "{0} teed"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4637,5 +4647,5 @@
 msgstr[1] "{0} seosed"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -4846,7 +4856,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "Kustuta valitud seos"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -4929,5 +4938,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5167,5 +5176,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "Asukohad"
@@ -5212,21 +5221,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "tüüp"
@@ -6026,72 +6035,509 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "Nimi"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "pilt"
+msgstr[1] "pildid"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "Sünkroniseeri kell"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "Pilt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "Kohanda värvi"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Vaikimisi"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Vali värv"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "Heli import"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "Piltide import"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "Muuda andme kihiks"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html> Töötlemata GPS andmete üleslaadimist kaardi andmetena loetakse "
+"kahjulikuks. <br> Kui soovite üles laadida radasid, vaata siia:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Muudetud sellest: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Andmekiht {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} kustutatud.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6100,7 +6546,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6110,442 +6556,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "Nimi"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "pilt"
-msgstr[1] "pildid"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "Sünkroniseeri kell"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "Pilt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "Kohanda värvi"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Vaikimisi"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Vali värv"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "Heli import"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "Piltide import"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "Muuda andme kihiks"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html> Töötlemata GPS andmete üleslaadimist kaardi andmetena loetakse "
-"kahjulikuks. <br> Kui soovite üles laadida radasid, vaata siia:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Muudetud sellest: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Andmekiht {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} kustutatud.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -6917,5 +6926,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr ""
@@ -6932,16 +6941,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr ""
@@ -6969,14 +6980,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr ""
@@ -7183,19 +7197,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr ""
@@ -7324,34 +7338,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "OSM parool"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
 
@@ -7701,7 +7691,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "Ei suutnud lugeda \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -7804,7 +7794,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "Tundmatu tüüp: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -7962,22 +7952,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "Vale salasõna või kasutajanimi."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Ettevaatust: Salasõna saadetakse krüpteerimata."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "Salvesta kasutaja ja salasõna (krüpteerimata)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "Sisesta salasõna"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "OSM parool"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
 
@@ -8141,14 +8155,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "Tundmatu tüüp: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "Valmistan ette OSM andmeid..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr ""
@@ -8590,5 +8604,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr ""
@@ -8989,5 +9003,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr ""
@@ -9312,5 +9326,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -9846,7 +9860,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr ""
@@ -10019,7 +10033,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "nimi"
+msgstr ""
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10569,12 +10582,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "{0} tee"
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0} punkt"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -10712,5 +10725,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr ""
@@ -11521,7 +11534,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr ""
@@ -11535,5 +11548,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr ""
@@ -11766,12 +11779,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "PAlun vali rida muutmiseks"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "Vali kõik."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
@@ -11784,7 +11795,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "Pole muudatusi mida üles laadida."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -11795,61 +11805,61 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr ""
@@ -12177,4 +12187,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12211,5 +12223,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr "Tänavad"
@@ -12220,5 +12232,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr ""
@@ -12227,5 +12239,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr ""
@@ -12252,8 +12264,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr ""
@@ -12294,21 +12306,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr ""
@@ -12322,8 +12334,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr "Rajad"
@@ -12341,15 +12353,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -12386,16 +12398,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr "Ühesuunaline"
@@ -12437,19 +12449,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Sild"
@@ -12485,19 +12497,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -12531,18 +12543,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr ""
@@ -12576,18 +12588,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr ""
@@ -12595,5 +12607,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr ""
@@ -12602,5 +12614,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr ""
@@ -12608,5 +12620,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr ""
@@ -12615,5 +12627,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr ""
@@ -12623,6 +12635,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr ""
@@ -12630,5 +12642,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr ""
@@ -12637,5 +12649,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr ""
@@ -12648,5 +12660,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr ""
@@ -12655,5 +12667,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr ""
@@ -12661,10 +12673,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr ""
@@ -12676,5 +12688,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr ""
@@ -12684,5 +12696,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr ""
@@ -12690,5 +12702,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr ""
@@ -12698,5 +12710,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr ""
@@ -12708,5 +12720,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr ""
@@ -12716,5 +12728,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr ""
@@ -12741,19 +12753,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr ""
@@ -12765,5 +12777,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Tänav"
@@ -12772,5 +12784,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr ""
@@ -12794,13 +12806,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr ""
@@ -12820,20 +12832,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr ""
@@ -12841,12 +12853,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr ""
@@ -12854,5 +12866,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr ""
@@ -12861,5 +12873,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr ""
@@ -12867,5 +12879,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr "Teenindus"
@@ -12874,5 +12886,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr ""
@@ -12882,18 +12894,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr ""
@@ -12901,5 +12913,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr ""
@@ -12909,5 +12921,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -12915,5 +12927,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -12922,5 +12934,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -12929,20 +12941,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr ""
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -12955,8 +12967,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr ""
@@ -13000,23 +13012,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr ""
@@ -13029,40 +13041,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr ""
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr ""
@@ -13075,19 +13087,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr ""
@@ -13110,65 +13122,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr ""
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr ""
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -13183,10 +13195,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr ""
@@ -13202,13 +13214,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr ""
@@ -13224,30 +13236,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr ""
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr ""
@@ -13255,25 +13267,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr ""
@@ -13284,5 +13296,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr ""
@@ -13304,9 +13316,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr ""
@@ -13326,10 +13338,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr ""
@@ -13351,10 +13363,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr ""
@@ -13376,10 +13388,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr ""
@@ -13401,6 +13413,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr ""
@@ -13414,9 +13426,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr ""
@@ -13430,9 +13442,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr ""
@@ -13462,10 +13474,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr ""
@@ -13473,4 +13485,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13488,6 +13507,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr ""
@@ -13498,10 +13517,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr ""
@@ -13509,19 +13528,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr "Teed"
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr ""
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr ""
@@ -13537,5 +13556,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr ""
@@ -13544,5 +13563,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr ""
@@ -13550,5 +13569,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr ""
@@ -13556,5 +13575,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr "Jalgrattatee"
@@ -13564,5 +13583,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr ""
@@ -13570,5 +13589,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr "Jalgtee"
@@ -13577,5 +13596,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr ""
@@ -13583,5 +13602,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr ""
@@ -13590,5 +13609,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr ""
@@ -13596,5 +13615,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr ""
@@ -13604,5 +13623,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr ""
@@ -13611,5 +13630,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr ""
@@ -13618,14 +13637,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr ""
@@ -13633,18 +13652,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr ""
@@ -13652,5 +13671,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr ""
@@ -13659,5 +13678,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr ""
@@ -13665,5 +13684,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr ""
@@ -13672,5 +13691,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr ""
@@ -13678,5 +13697,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr ""
@@ -13685,5 +13704,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr ""
@@ -13691,5 +13710,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr ""
@@ -13698,5 +13717,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr ""
@@ -13704,5 +13723,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr ""
@@ -13711,5 +13730,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -13718,5 +13737,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr ""
@@ -13725,13 +13744,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr ""
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr ""
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr ""
@@ -13739,5 +13758,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr "Matkamine"
@@ -13747,5 +13766,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr ""
@@ -13753,5 +13772,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr ""
@@ -13761,5 +13780,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr ""
@@ -13767,5 +13786,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr ""
@@ -13775,5 +13794,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr ""
@@ -13781,5 +13800,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr ""
@@ -13789,5 +13808,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr ""
@@ -13795,5 +13814,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr ""
@@ -13803,5 +13822,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr ""
@@ -13809,5 +13828,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr ""
@@ -13817,5 +13836,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr ""
@@ -13823,10 +13842,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr ""
@@ -13834,15 +13853,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr ""
@@ -13850,5 +13869,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr ""
@@ -13883,14 +13902,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr "Operaatorfirma"
@@ -13899,5 +13918,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr ""
@@ -13907,5 +13926,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -13914,27 +13933,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr ""
@@ -13942,6 +13961,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr ""
@@ -13950,11 +13969,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -13962,30 +13981,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr ""
@@ -13993,5 +14012,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -14000,14 +14019,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr ""
@@ -14018,14 +14037,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr ""
@@ -14035,20 +14054,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr "Linnapiiri märk"
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr ""
@@ -14056,5 +14075,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr ""
@@ -14062,5 +14081,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr ""
@@ -14068,5 +14087,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr ""
@@ -14075,10 +14094,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr ""
@@ -14086,5 +14105,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr ""
@@ -14092,5 +14111,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -14102,7 +14121,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr ""
@@ -14110,5 +14129,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr ""
@@ -14116,5 +14135,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr ""
@@ -14122,5 +14141,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr ""
@@ -14159,18 +14178,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr ""
@@ -14179,5 +14202,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr ""
@@ -14185,5 +14208,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr ""
@@ -14191,10 +14214,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr ""
@@ -14202,15 +14225,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr ""
@@ -14218,5 +14241,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr ""
@@ -14224,10 +14247,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr ""
@@ -14237,5 +14260,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr ""
@@ -14244,5 +14267,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr ""
@@ -14251,5 +14274,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr ""
@@ -14257,5 +14280,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr ""
@@ -14264,5 +14287,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr ""
@@ -14274,15 +14297,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr ""
@@ -14290,50 +14313,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr ""
@@ -14341,15 +14364,26 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+msgid "Turnstile"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "Muuda puud"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr ""
@@ -14360,10 +14394,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr ""
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr ""
@@ -14371,5 +14405,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr ""
@@ -14377,5 +14411,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr ""
@@ -14383,10 +14417,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr ""
@@ -14394,10 +14428,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr ""
@@ -14405,10 +14439,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr ""
@@ -14418,5 +14452,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr ""
@@ -14424,15 +14458,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr ""
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr ""
@@ -14440,15 +14474,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr ""
@@ -14456,15 +14490,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -14472,5 +14506,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr ""
@@ -14479,10 +14513,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr ""
@@ -14493,14 +14527,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr ""
@@ -14514,35 +14548,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr ""
@@ -14550,20 +14584,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr ""
@@ -14571,10 +14605,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr ""
@@ -14582,5 +14616,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr ""
@@ -14588,5 +14622,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr ""
@@ -14594,5 +14628,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr ""
@@ -14601,5 +14635,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr ""
@@ -14607,10 +14641,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr ""
@@ -14618,5 +14652,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr ""
@@ -14624,5 +14658,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr ""
@@ -14630,15 +14664,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr ""
@@ -14647,5 +14681,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr ""
@@ -14653,20 +14687,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr ""
@@ -14675,15 +14709,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr ""
@@ -14691,10 +14725,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr ""
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr ""
@@ -14702,10 +14736,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr ""
@@ -14715,5 +14749,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr ""
@@ -14721,10 +14755,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr ""
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr ""
@@ -14732,5 +14766,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr ""
@@ -14760,8 +14794,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr ""
@@ -14775,35 +14809,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr ""
@@ -14811,45 +14845,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr ""
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr ""
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr ""
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr ""
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr ""
@@ -14857,5 +14891,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -14864,14 +14898,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr ""
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr ""
@@ -14880,5 +14914,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr ""
@@ -14887,5 +14921,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr ""
@@ -14895,5 +14929,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr ""
@@ -14901,5 +14935,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr ""
@@ -14908,10 +14942,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr ""
@@ -14919,10 +14953,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr ""
@@ -14930,10 +14964,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr ""
@@ -14941,10 +14975,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr ""
@@ -14952,5 +14986,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr ""
@@ -14958,5 +14992,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr ""
@@ -14967,10 +15001,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr ""
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr ""
@@ -14980,5 +15014,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr ""
@@ -14994,5 +15028,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15002,5 +15036,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr ""
@@ -15008,41 +15042,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr ""
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr ""
@@ -15050,5 +15084,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr "Pood"
@@ -15056,15 +15090,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr ""
@@ -15072,5 +15106,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr ""
@@ -15079,10 +15113,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr ""
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr ""
@@ -15090,5 +15124,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr ""
@@ -15096,5 +15130,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr ""
@@ -15103,5 +15137,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr ""
@@ -15110,15 +15144,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "Avalik transport"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr ""
@@ -15126,5 +15160,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr ""
@@ -15132,5 +15166,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr ""
@@ -15138,5 +15172,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr ""
@@ -15145,5 +15179,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr ""
@@ -15151,5 +15185,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr ""
@@ -15158,5 +15192,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr ""
@@ -15168,5 +15202,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr ""
@@ -15174,10 +15208,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr ""
@@ -15186,10 +15220,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr ""
@@ -15198,5 +15232,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr ""
@@ -15205,5 +15239,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr ""
@@ -15211,5 +15245,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr ""
@@ -15219,5 +15253,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr ""
@@ -15228,6 +15262,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr ""
@@ -15235,10 +15269,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr ""
@@ -15246,5 +15280,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr ""
@@ -15252,5 +15286,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr ""
@@ -15258,5 +15292,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr ""
@@ -15264,15 +15298,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr ""
@@ -15281,5 +15315,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr "Majutus"
@@ -15291,5 +15325,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -15298,15 +15332,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr ""
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr ""
@@ -15314,20 +15348,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr ""
@@ -15335,10 +15369,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr ""
@@ -15346,30 +15380,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr ""
@@ -15377,10 +15411,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "Toit ja jook"
@@ -15391,5 +15425,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restoran"
@@ -15397,5 +15431,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr ""
@@ -15403,5 +15437,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr ""
@@ -15409,61 +15443,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr "kohalik"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr "Kiirtoit"
@@ -15471,9 +15505,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr "Kohvik"
@@ -15481,10 +15515,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr ""
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr "Pubi"
@@ -15492,20 +15526,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr ""
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr "Baar"
@@ -15513,10 +15547,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr "Ööklubi"
@@ -15524,20 +15558,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr ""
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "Turism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr "Vaatamisväärsus"
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr ""
@@ -15546,11 +15580,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr "Avatud"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "Muuseum"
@@ -15558,10 +15592,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr ""
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "Loomaaed"
@@ -15570,10 +15604,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr ""
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr ""
@@ -15581,25 +15615,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr "Teemapark"
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr ""
@@ -15607,5 +15641,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr ""
@@ -15613,5 +15647,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr "Infopunkt"
@@ -15619,80 +15653,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr ""
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "Kaart"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr ""
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr ""
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr ""
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr ""
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
+msgid "Closer Description"
+msgstr ""
+
+#. item "Tourism/Map" text "Closer Description"
+#: build/trans_presets.java:1701
+msgid "Information Board"
+msgstr ""
+
+#. item "Tourism/Information Board" text "Name"
+#: build/trans_presets.java:1705
+msgid "Board Type"
+msgstr ""
+
+#. item "Tourism/Information Board" combo "Board Type"
+#: build/trans_presets.java:1705
+msgid "board"
+msgstr ""
+
+#: build/trans_presets.java:1705
+msgid "history"
+msgstr ""
+
+#: build/trans_presets.java:1705
+msgid "nature"
+msgstr ""
+
+#: build/trans_presets.java:1705
+msgid "wildlife"
+msgstr ""
+
+#. item "Tourism/Information Board" text "Closer Description"
 #: build/trans_presets.java:1708
-msgid "Closer Description"
-msgstr ""
-
-#. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
-msgid "Information Board"
-msgstr ""
-
-#. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
-msgid "Board Type"
-msgstr ""
-
-#. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
-msgid "board"
-msgstr ""
-
-#: build/trans_presets.java:1694
-msgid "history"
-msgstr ""
-
-#: build/trans_presets.java:1694
-msgid "nature"
-msgstr ""
-
-#: build/trans_presets.java:1694
-msgid "wildlife"
-msgstr ""
-
-#. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
 msgid "Guidepost (Hiking)"
 msgstr ""
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr ""
@@ -15700,25 +15734,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr "Lõkkease"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr "Piknikuplats"
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "Ajaloolised kohad"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "Loss"
@@ -15727,20 +15761,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr ""
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "Varemed"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr ""
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr ""
@@ -15749,10 +15783,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr ""
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr ""
@@ -15760,5 +15794,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr ""
@@ -15766,15 +15800,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr "Mälestusmärk"
@@ -15782,45 +15816,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "Puhkus"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr "Veepark"
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "Mänguväljak"
@@ -15828,15 +15862,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "Kalapüük"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr ""
@@ -15844,15 +15878,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "Staadion"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr ""
@@ -15866,6 +15900,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "vali spordiala:"
@@ -15888,4 +15922,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -15946,5 +15988,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -15954,5 +16004,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16098,5 +16148,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16202,5 +16252,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16241,29 +16291,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr ""
@@ -16273,227 +16324,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr "kanuu"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr "ameerika_jalgpall"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr "suusatamine"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "jalgpall"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "lauatennis"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr "Golfiväljak"
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr ""
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr ""
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr ""
@@ -16532,191 +16583,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr ""
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr ""
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr "Ujumine"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr ""
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr "Suusatamine"
@@ -16724,56 +16775,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr "mägi"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr "murdmaa"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr "lumepark"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr "Raskusaste"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr "kerge"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr "Lasketiir"
@@ -16781,178 +16832,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr "Jalgpall"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr "Pesapall"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr "Vali pesapall"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr "Korvpall"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr "Vali korvpall"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr "Golfiväljak"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr "Vali kriket"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr "Ragbi"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr "Vali ragbi"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr "Laua tennis"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr "Vali laua tennis"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr "Vali tennis"
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "Ehitised"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr "Ehirus"
@@ -16960,5 +17011,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "Avalik hoone"
@@ -16966,10 +17017,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "Raekoda"
@@ -16977,10 +17028,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "Vali raekoda"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "Saatkond"
@@ -16988,10 +17039,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "Vali saatkond"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "Kohtumaja"
@@ -17000,10 +17051,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "Vali kohtumaja"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "Vangla"
@@ -17012,10 +17063,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "Vali vangla"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "Politsei"
@@ -17025,10 +17076,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "Vali politsei"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "Tuletõrjedepoo"
@@ -17037,10 +17088,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "Vali tuletõrjedepoo"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "Postkontor"
@@ -17048,5 +17099,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr ""
@@ -17054,15 +17105,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr "Lasteaed"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr "Vali lasteaed"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "Kool"
@@ -17070,10 +17121,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "Vali kool"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr "Ülikool"
@@ -17081,10 +17132,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr "Vali ülikool"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr "Kolledž"
@@ -17092,5 +17143,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr "Vali kolledž"
@@ -17098,5 +17149,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "Kino"
@@ -17105,10 +17156,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "Vali kino"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "Raamatukogu"
@@ -17117,10 +17168,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "Vali raamatukogu"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr ""
@@ -17128,10 +17179,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "Teater"
@@ -17140,10 +17191,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "Vali teater"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr "Palvekoht"
@@ -17153,5 +17204,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr "Vali palvekoht"
@@ -17160,6 +17211,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr "Religioon"
@@ -17168,66 +17219,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr "budist"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr "kristlane"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr "juudi"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr "moslem"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr "zoroastrism (pärsia)"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr "Usutunnistus"
@@ -17236,81 +17287,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr "anglikaan"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr "katoliku"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr "evangeelne"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr "jehoovatunnistajad"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr "luterlane"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr "metodist"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr "mormoon"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr "ortodoksne"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr "nelipühalane"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr "presbüterlane"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr "protestantlik"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr "kveeker"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr "šiia"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr "Aadressid"
@@ -17319,5 +17370,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr "Vali aadressi infot"
@@ -17325,5 +17376,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr "Maja number"
@@ -17331,20 +17382,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr "Maja nimi"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr "Linna nimi"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "Posti kood"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr "Riigi kood"
@@ -17352,5 +17403,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr ""
@@ -17359,5 +17410,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -17365,71 +17416,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr "paaritu"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr "paaris"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr "kõik"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr "Inimtekkeline"
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr "Töökojad"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr "Vali töökojad"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "Torn"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "Vali torn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "Veetorn"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "Vali veetorn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr "Gaasimahuti"
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr "Vali gaasimahuti"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "Majakas"
@@ -17437,10 +17488,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "Vali majakas"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "Tuuleveski"
@@ -17448,10 +17499,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "Vali tuuleveski"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "Torustik"
@@ -17459,10 +17510,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "Vali torustik"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr ""
@@ -17472,10 +17523,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr "Kraana"
@@ -17483,10 +17534,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr "Vali kraana"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr "Tuletorn"
@@ -17494,10 +17545,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr "Vali tuletorn"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr "Geodeetiline punkt"
@@ -17505,10 +17556,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr "Vali ülevaatlus punkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr "järelvalve"
@@ -17516,5 +17567,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr "Vali järelvalve kaamera"
@@ -17522,5 +17573,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr "Elektri generaator"
@@ -17530,39 +17581,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr "Vali elektri generaator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr "tuul"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr "hüdro"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr "fosiil"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr "tuuma"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr "süsi"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr "gaas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr "Elektrijaam"
@@ -17571,10 +17622,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr "Vali elektrijaam"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr "Elektrialajaam"
@@ -17583,5 +17634,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr "Vali elektri alajaam"
@@ -17589,10 +17640,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr ""
@@ -17603,5 +17654,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr ""
@@ -17609,5 +17660,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr ""
@@ -17616,25 +17667,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr "Pinge"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr "Teenused"
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "Tualetid"
@@ -17642,20 +17693,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr "Märkus"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "Telefon"
@@ -17664,5 +17715,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr ""
@@ -17670,5 +17721,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "Mündid"
@@ -17676,5 +17727,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr "Märkused"
@@ -17682,5 +17733,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -17688,5 +17739,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr "Deebetkaart"
@@ -17694,15 +17745,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "Krediitkaart"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "Telefoni kaart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr "Jäätmekäitlus"
@@ -17711,5 +17762,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr "Muuda jäätmekäitlusjaam"
@@ -17717,35 +17768,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr "Battareid"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr "Riided"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr "Klaas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr "Paber"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr "Vanaraud"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr ""
@@ -17754,20 +17805,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr "Jahikantsel"
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr "Muuda jahiala"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr "Peida"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr "Lukusta"
@@ -17775,22 +17826,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr "Kõrgus"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr "madal"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr "pool"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr "täis"
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr "Purskaev"
@@ -17799,10 +17850,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr "Vali purskaev"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "Joogi vesi"
@@ -17811,10 +17862,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "Vali joogivee asukoht"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr ""
@@ -17822,25 +17873,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "Poed"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr "Vali Supermarket"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr "Nurgakauplus"
@@ -17848,10 +17899,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr "Vali nurgakauplus"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -17859,10 +17910,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr "Vali kiosk"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr ""
@@ -17870,5 +17921,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr ""
@@ -17876,88 +17927,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr "ühistranspordi_piletid"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr "ühistranspordi_plaanid"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr "parkimis_pilet"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr "toit"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "joogid"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr "maiustused"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr "suitsud"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr "fotod"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr "looma_toit"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "ajalehed"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "mänguasjad"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr "templid"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "SIM-kaardid"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr "kondoomid"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr "tampoonid"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "Lihunik"
@@ -17965,10 +18016,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "Vali lihunik"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "Pagar"
@@ -17976,10 +18027,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "Vali pagar"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr "Lilleseadja"
@@ -17987,20 +18038,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr "Vali lilleseadja"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr "Ökokaubad"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr "Redigeeri ökopoodi"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr ""
@@ -18008,60 +18059,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr ""
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr "Joogipood"
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr ""
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr "Arvuti"
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr "Vali arvutipood"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr "Elektroonika"
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr "Vali elektroonika pood"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr ""
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr "Mööbel"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr "Vali mööblipood"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr "Aiakeskus"
@@ -18069,10 +18120,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr "Vali aiakeskus"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr "Riistvara"
@@ -18080,10 +18131,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr "Vali riistvara pood"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -18091,60 +18142,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr "Kirjatarbed"
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr "Vali kirjatarvete pood"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr "Juuksur"
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr "Vali juuksur"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr "Jalatsid"
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr "Vali jalatsi pood"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr "Mänguasjad"
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr "Vali mänguasja pood"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr "Video"
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr "Vali video pood"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "Kuiir puhastus"
@@ -18152,10 +18203,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "Vali kiirpuhastus"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "Pesumaja"
@@ -18163,10 +18214,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "Vali pesumaja"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr "Välisuks"
@@ -18174,35 +18225,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr "Vali välisukse pood"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr "Sport"
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr "Vali spordi pood"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr "Optik"
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr "Vali optika"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "Sularaha"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "Pank"
@@ -18210,5 +18261,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "Vali Pank"
@@ -18216,10 +18267,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "Sularaha automaat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr "Raha vahetus"
@@ -18227,5 +18278,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr "Vali rahavahetus punkt"
@@ -18233,15 +18284,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "Vali sularaha automaat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "Tervis"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr "Arstid"
@@ -18249,20 +18300,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr "Vali arstid"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr "Hambaarst"
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr "Vali hambaarst"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "Apteek"
@@ -18270,5 +18321,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "Vali Apteek"
@@ -18276,10 +18327,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr "Retseptuur"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "Haigla"
@@ -18287,10 +18338,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "Vali haigla"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr "Hädaabi tugijaam"
@@ -18299,5 +18350,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr "Vali hädaabi tugijaam"
@@ -18306,20 +18357,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr "Punkti number"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr "Punkti nimi"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr "Telefoninumber"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -18327,5 +18378,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr "Loomaarst"
@@ -18334,56 +18385,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr "Vali loomaarst"
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr "Vali kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr "Maa"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr "Vali maa"
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr "Riik"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr "Vali riik"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr "Regioon"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr "Vali regioon"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr "Maakond"
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr "Vali maakond"
@@ -18391,15 +18441,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr "Linn"
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr "Vali linn"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr "Linn"
@@ -18407,10 +18457,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr "Muuda linna"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr "Linnaosa"
@@ -18418,25 +18468,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr "Muuda linnaosa"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "Küla/Alevik/Alev"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "Muuda küla/alevik/alev"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr "Küla"
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr "Muuda küla"
@@ -18444,5 +18494,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr "Asustamata koht"
@@ -18450,10 +18500,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr "Muuda asustamata kohta"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "Saar"
@@ -18461,5 +18511,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "Muuda saart"
@@ -18467,5 +18517,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr "Koobas"
@@ -18473,10 +18523,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr "Muuda koobast"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "Mäetipp"
@@ -18484,10 +18534,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "Muuda mäetippu"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr "Liustik"
@@ -18495,10 +18545,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr "Muuda liustikku"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr "Vulkaan"
@@ -18506,70 +18556,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr "Muuda vulkaani"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr "Piirid"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr "Riiklikud"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr "Muuda riiklikke piire"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr "Administratiivpiir"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr "Muuda administratiivpiire"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr "Omavalitsus"
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr "Muuda omavalitsuse piire"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr "Valimisringkond"
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr "Muuda valimisringkonda"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr "Rahvuspark"
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr "Muuda rahvuspargi piire"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr "Maakasutus"
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "Üksik puu"
@@ -18578,15 +18628,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "Muuda puud"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr "Botaaniline nimi"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr "Mets"
@@ -18595,5 +18645,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr "Muuda metsa"
@@ -18601,17 +18651,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr "okasmets"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr "lehtmets"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr "segamets"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "Kultuurmets"
@@ -18620,14 +18670,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr "Muuda kultuurmetsa"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr "Looduskaitseala"
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr "Muuda looduskaitseala"
@@ -18635,25 +18685,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr "klibu, rusukalle"
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr "Muuda rusukallet"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr "Võsa"
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr "Muuda võsa"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr "Langus"
@@ -18661,10 +18711,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr "Muuda langust"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr "Nõmm"
@@ -18672,5 +18722,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr "Muuda nõmme"
@@ -18678,5 +18728,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr "Taluõu"
@@ -18685,45 +18735,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr "Muuda taluõue"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr "Talumaa"
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr "Muuda talumaad"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr "Niit/Karjamaa"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr "Muuta niitu"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr "Viinapuuistandus"
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr "Muuda viinapuuistandust"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr "Eraldised"
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr "Muuda eraldisi"
@@ -18731,25 +18781,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr "Aed"
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr "Muuda aeda"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr "Muru"
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr "Muuda muru"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr "Külatanum"
@@ -18757,10 +18807,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr "Muuda külatanumat"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr "Avalik maa"
@@ -18768,20 +18818,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr "Muuda avalikku maad"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr "Muuda parki"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr "Puhkeala"
@@ -18789,5 +18839,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr "Muuda puhkeala"
@@ -18795,15 +18845,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr "Elamurajoon"
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr "Muuda elamurajooni"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr "Matmispaik"
@@ -18811,9 +18861,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr "Muuda matmispaika"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr "Kalmistu"
@@ -18821,39 +18871,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr "Muuda kalmistut"
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr "Kaubandus"
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr "Muuda kaubandust"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr "Kommerts"
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr "Muuda kommertspiirkonda"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr "Tööstus"
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr "Muuda tööstuspiirkonda"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr "Raudtee"
@@ -18861,15 +18911,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr "Muuda raudteed"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr "Militaarala"
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr "Muuda militaarala"
@@ -18877,55 +18927,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr "Ehitustanner"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr "Muuda ehitustandrit"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr "Jäätmaa"
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr "Muuda jäätmaad"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr "Roheala"
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr "Muuda roheala"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr "Prügimägi"
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr "Muuda prügimäge"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr "Kivimurd"
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr "Muuda kivimurdu"
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr "Hulknurk"
@@ -18935,5 +18985,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr "Muuda hulknurka"
@@ -18942,10 +18992,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr "väline osa"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr "siseosa"
@@ -18953,5 +19003,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr "Pöördekeelud"
@@ -18960,5 +19010,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr "Muuda pöördekeelde"
@@ -18966,34 +19016,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr "Keelud"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr "vasakpöörde keeld"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr "parempöörde keeld"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr "ei tohi otse sõita"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr "ei tohi tagasi pöörata"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr "ainult parempööre"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr "ainult vaskpööre"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr "ainult otsesõit"
@@ -19002,15 +19052,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr "teelt"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr "üle sõlme või tee"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr "teele"
@@ -19018,5 +19068,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr "Teekond"
@@ -19025,5 +19075,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr "Muuda teekonda"
@@ -19031,5 +19081,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr "teekonna tüüp"
@@ -19101,24 +19151,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr "jalgrattaga"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr "tee"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr "praam"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr "suusad"
@@ -19171,20 +19221,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr "jalgsi"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr "matkamine"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr "tramm"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr "ümbersõit"
@@ -19198,10 +19248,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr "metroo"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr "sümboolne kirjeldus"
@@ -19209,26 +19259,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr "Võrk"
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "teekonna tüüp"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr "planeeritud"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr "täiendav"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr "ajutine"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr "ühendus"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr "Värv (hex)"
@@ -19237,30 +19293,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr "teekonna osa"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr "edasisuunaline osa"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr "tagasisuunaline osa"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr "peatuspunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr "edasisuunaline peatuspunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr "tagasisuunaline peatuspunkt"
@@ -19296,6 +19352,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19311,5 +19368,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19328,5 +19393,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr "standard"
@@ -19420,7 +19485,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr "sild"
@@ -19685,15 +19750,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr "kasutusest väljas"
@@ -19735,5 +19800,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr "hobused"
@@ -19871,4 +19936,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19880,5 +19951,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19886,5 +19957,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19921,5 +19992,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19943,11 +20014,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr ""
@@ -19971,5 +20042,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20010,5 +20081,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20046,6 +20117,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr "tänav"
@@ -20101,7 +20172,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr "teerada"
@@ -20154,11 +20225,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr "raudtee"
@@ -20179,5 +20258,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr "teenused"
@@ -20191,5 +20270,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr ""
@@ -20210,5 +20289,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr "tagasipööramisring"
@@ -20222,6 +20301,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr ""
@@ -20236,5 +20315,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr "jõekallas"
@@ -20248,5 +20327,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr "oja"
@@ -20260,5 +20339,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr "dokk"
@@ -20286,5 +20365,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr "akvedukt"
@@ -20427,5 +20506,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20452,13 +20531,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr "inimtekkeline"
@@ -20520,7 +20599,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr ""
@@ -20543,10 +20622,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr "muu rööbastee"
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr "ülarelss"
@@ -20582,7 +20661,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr "kasutamata raudtee"
@@ -20627,6 +20706,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr "aeronautika"
@@ -20640,5 +20719,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr "lennuterminal"
@@ -20660,5 +20739,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr "helikopterid"
@@ -20672,5 +20751,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr "kerglennukid"
@@ -20678,4 +20757,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20718,7 +20804,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr "trosstransport"
@@ -20735,5 +20821,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr "suusanõlv lihtne"
@@ -20748,5 +20834,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr "suusanõlv keskmine"
@@ -20761,5 +20847,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr "suusanõlv edasijõudnutele"
@@ -20774,5 +20860,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr ""
@@ -20787,5 +20873,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr "suusanõlv klassita"
@@ -20800,5 +20886,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr "suusanõlv algajale"
@@ -20821,4 +20907,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -20829,4 +20922,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -20903,10 +21004,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr "elektrivarustus"
@@ -20920,5 +21022,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr "kai"
@@ -20932,5 +21034,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr "torujuhe"
@@ -21058,12 +21160,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr "puhkealad"
@@ -21077,5 +21179,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr "paadisadam"
@@ -21147,8 +21249,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr "mugavused"
@@ -21250,10 +21352,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr "autohooldus"
@@ -21273,4 +21375,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21292,4 +21401,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21613,4 +21729,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -21637,24 +21761,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr "muud teenused"
@@ -21686,6 +21818,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr "vesi"
@@ -21746,8 +21878,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr "tervishoid"
@@ -22100,26 +22232,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr "pood"
@@ -22174,5 +22306,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22191,8 +22323,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr "hotell"
@@ -22342,9 +22474,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr "turism"
@@ -22416,8 +22548,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr "alalooline"
@@ -22488,8 +22620,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr "roheala"
@@ -22503,5 +22635,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr "kivimurd"
@@ -22515,5 +22647,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr "prügimägi"
@@ -22535,5 +22667,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr "tehisjärv"
@@ -22547,5 +22679,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr "kultuurmets"
@@ -22559,5 +22691,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr "taluõu"
@@ -22580,5 +22712,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr "kaubandus"
@@ -22592,5 +22724,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr "tööstus"
@@ -22604,5 +22736,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr "jäätmaa"
@@ -22616,5 +22748,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr "rohepiirkond"
@@ -22628,5 +22760,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr "raudteede piirkond"
@@ -22683,7 +22815,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr "militaarala"
@@ -22697,5 +22829,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr "kalmistu"
@@ -22708,5 +22840,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr "mäetipp"
@@ -22721,5 +22853,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr "liustik"
@@ -22733,5 +22865,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr "vulkaan"
@@ -22786,8 +22918,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr "looduslik"
@@ -22801,5 +22933,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr "põõsastik"
@@ -22813,5 +22945,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr "nõmm"
@@ -22825,5 +22957,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr "mets"
@@ -22837,5 +22969,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr "muda"
@@ -22849,5 +22981,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr "rand"
@@ -22925,8 +23057,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr "teekond"
@@ -22974,7 +23106,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr "piir"
@@ -23116,10 +23248,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr "koht"
@@ -23167,6 +23299,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr "aadress"
@@ -23463,15 +23595,15 @@
 msgstr ""
 
+#~ msgid "Move"
+#~ msgstr "Liiguta"
+
+#~ msgid "Data Layer"
+#~ msgstr "Andmekiht"
+
+#~ msgid "Not implemented yet."
+#~ msgstr "Pole veel teostatud."
+
 #~ msgid "Unknown file extension."
 #~ msgstr "Tundmatu faililaiend."
-
-#~ msgid "Move"
-#~ msgstr "Liiguta"
-
-#~ msgid "Data Layer"
-#~ msgstr "Andmekiht"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Pole veel teostatud."
 
 #~ msgid "Email"
Index: /applications/editors/josm/i18n/po/fi.po
===================================================================
--- /applications/editors/josm/i18n/po/fi.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/fi.po	(revision 17069)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
-"PO-Revision-Date: 2009-08-04 10:54+0000\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
+"PO-Revision-Date: 2009-08-10 13:30+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-10 11:58+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -56,6 +56,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -100,6 +100,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "Virhe"
@@ -110,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "Tallentamattomia muutoksia"
@@ -128,10 +128,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -148,15 +148,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -186,6 +186,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -215,5 +215,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -369,5 +369,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
 msgstr ""
@@ -451,9 +451,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -486,7 +486,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -567,37 +567,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "taso"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "valinta"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "ristiriita"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "lataa"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Sovita näkymä {0}:aan."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Sovita {0} näkymään."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -607,30 +607,30 @@
 msgstr "Näytä: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "Ei mitään valittuna"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "Ei ristiriitoja"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "Yhdistä polkuja"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "Yhdistää monta polkua yhdeksi."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "Valitse ainakin kaksi yhdistettävää polkua."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr "Yhdistetäänkö polut, joilla on eriävät jäsenyydet?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -640,13 +640,13 @@
 "ne?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "Yhdistä silti"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "Vaihdetaanko suuntia?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -655,10 +655,10 @@
 "Polkuja ei voi yhdistää nykyisessä suunnassa. Haluatko kääntää osan niistä?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "Käännä ja yhdistä"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -666,20 +666,20 @@
 msgstr "Syötä arvot kaikille ristiriidoille."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Ratkaise ristiriitoja"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Yhdistä {0} polkua"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "Kaikki polut olivat tyhjiä"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -726,6 +726,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -747,6 +747,6 @@
 msgstr "Poista valitut objektit."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -756,5 +756,5 @@
 msgstr "Korvaa"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -886,7 +886,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "Vie data GPX-tiedostoon."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -902,5 +901,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -918,5 +917,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -988,22 +987,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "Yhdistä pisteet"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "Yhdistää pisteet vanhimpaan."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "Valitse vähintään kaksi yhdistettävää pistettä."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr "Yhdistetäänkö pisteet, joilla on eriävät relaatiojäsenyydet?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1013,13 +1012,13 @@
 "ne?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "Yhdistä silti"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "Pisteitä ei voitu yhdistää. Käytössä oleva polku tulisi poistaa ensin."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1274,7 +1273,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "Ei mitään tallennettavaa: ei avoimia tiedostoja."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1872,5 +1870,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1882,5 +1880,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr ""
@@ -1920,11 +1918,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2063,5 +2061,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2136,5 +2134,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Etsi objekteja."
@@ -2258,5 +2256,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Etsi"
@@ -2457,5 +2455,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2498,5 +2496,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr "Poista relaatiosta"
@@ -2538,9 +2536,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "Yhdistä {0} pistettä"
-msgstr[1] "Yhdistä {0} pistettä"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2576,9 +2574,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "{0} piste"
-msgstr[1] "{0} pistettä"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2744,7 +2742,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "Muuta {0} objekti"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2754,5 +2752,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2799,5 +2797,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2830,5 +2828,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2842,5 +2840,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "rata"
@@ -2855,5 +2853,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3133,5 +3131,5 @@
 msgstr "Älä näytä uudelleen"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3140,5 +3138,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3148,10 +3146,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3159,25 +3157,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "tuntematon"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3187,9 +3185,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3198,9 +3196,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "Odottamaton poikkeus"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3210,9 +3220,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "Tuntematon palvelin"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3222,5 +3232,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr ""
@@ -3304,10 +3314,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "Käyttäjänimi"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "Salasana"
@@ -3509,15 +3519,15 @@
 msgstr "(ei objektia)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "taso ei ole listassa."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3571,5 +3581,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr ""
@@ -3578,5 +3588,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr ""
@@ -3585,20 +3595,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3608,6 +3618,6 @@
 msgstr "Tagit"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3615,6 +3625,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3622,40 +3632,40 @@
 msgstr "Jäsenet"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3663,74 +3673,74 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3738,30 +3748,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3769,5 +3779,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3775,13 +3785,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3789,5 +3799,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3795,21 +3805,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3818,27 +3828,27 @@
 msgstr "Poista"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3846,5 +3856,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3853,5 +3863,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3860,5 +3870,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3867,5 +3877,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -3874,21 +3884,21 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -3898,5 +3908,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -3906,5 +3916,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -3912,19 +3922,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -3933,19 +3943,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -3954,9 +3964,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -3966,13 +3976,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -3980,90 +3990,90 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "poistettu"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4073,17 +4083,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4092,14 +4102,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4107,21 +4117,21 @@
 msgstr "Rooli"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4129,14 +4139,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4144,7 +4154,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4156,7 +4166,7 @@
 msgstr "Avain"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4169,45 +4179,45 @@
 msgstr "Arvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr ""
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4228,8 +4238,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4266,5 +4276,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4366,83 +4376,83 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "Tasot"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "Avaa lista kaikista ladatuista tasoista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "Poista valittu taso."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr "Poista taso"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "Näytä/piilota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "Näytä/piilota valittu taso."
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "Siirrä valittu taso rivi ylöspäin."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "Siirrä valittu taso rivi alaspäin."
@@ -4452,6 +4462,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4460,22 +4470,22 @@
 msgstr[1] "Olet muuttamassa {0} kohdetta."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "Tyhjä arvo poistaa avaimen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<eri>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "Muutetaanko arvot?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4483,5 +4493,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4490,40 +4500,40 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "Valitse avain"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "Valitse arvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 msgid "Please select the objects you want to change properties for."
 msgstr "Valitse objektit, joiden ominaisuuksia haluat muokata."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "Ominaisuudet/jäsenyydet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "Valittujen objektien ominaisuudet."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "Jäsenyydet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "Lisää ominaisuuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4540,39 +4550,39 @@
 msgstr "Lisää"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 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/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "Muokkaa ominaisuuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 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/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Ominaisuudet: {0} / Jäsenyydet: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "Ominaisuudet / Jäsenyydet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "Muuta relaatiota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Poistetaanko valinta relaatiosta {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "Poista valittu avain kaikista objekteista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "Poista asetukset"
@@ -4584,5 +4594,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "Relaatiot"
@@ -4614,31 +4624,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "Tämänhetkinen valinta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "Avaa valintaikkuna."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "Sovita näkymä valittuihin kohteisiin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "Päivitä valintalista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "Sovita näkymä valintaan"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Valinta: Rel.:{0}/Polut:{1}/Pisteet:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4646,5 +4656,5 @@
 msgstr "Valinta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4653,5 +4663,5 @@
 msgstr[1] "{0} polkua"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4660,5 +4670,5 @@
 msgstr[1] "{0} relaatiota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -4870,7 +4880,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "Poista valittu relaatio"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -4953,5 +4962,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5193,5 +5202,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "Paikat"
@@ -5238,21 +5247,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "tyyppi"
@@ -6052,72 +6061,509 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "Nimi"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr "Lue GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Ei aikaleimaa pisteelle {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Aikaleimaa \"{0}\" ei voitu lukea pisteestä {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr "Ei löytynyt aikaleimallisia kuvia."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "Luetaan {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr "Geo-merkityt kuvat"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr "aikavyöhyke-ero: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "kuva"
+msgstr[1] "kuvat"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "Tahdista kello"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG-kuvat (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Päivämäärää tiedostosta \"{0}\" ei voitu tulkita."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Tiedostossa \"{0}\" ei ole EXIF-aikaleimaa."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "Kuva"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Syötä näytetty päivämäärä (kk/pp/vvvv TT:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr "GPS-yksikön aikavyöhyke (ero kuvaan)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr "Tahdista aika GPS-yksikön kanssa"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr "Syötettyä aikaa ei voitu tulkita oikein."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr "gps-piste"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "Muokkaa viivanpiirtotyyliä"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr "Käytä globaaleja asetuksia."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr "Piirrä viivat pisteiden välillä tällä tasolla."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr "Älä piirrä viivoja pisteiden välillä tällä tasolla."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr "Viivanpiirtoasetukset"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "Muokkaa väriä"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Oletusarvo"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Valitse väri"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "Tuo äänitiedosto"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr "Ääniaaltotiedostot (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "Tuo kuvia"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} jälki, "
+msgstr[1] "{0} jälkeä, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} reitti, "
+msgstr[1] "{0} reittiä, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} reittipiste"
+msgstr[1] "{0} reittipistettä"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr "Nimi: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr "Kuvaus: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr "Ajanjakso: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr "Pituus: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "Muuta datatasoksi"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>Käsittelemättömän GPS-datan lähettämistä karttadatana pidetään "
+"haitallisena.<br>Jos haluat lähettää jälkiä, katso:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Muutettu jäljestä {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr "Lataa data OSM-palvelimelta tämän jäljen varrelta"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr "Lataa kaikki  alueella:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr "{0} metriä"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr "Yhden pyynnön enimmäisalue:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} neliökilometriä"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr "<html>Tämä vaatii {0} erillistä latauspyyntöä.<br>Jatketaanko?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr "Tasolla ei ole yhtään GPX-jälkeä, johon liittää äänitiedosto."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Datataso {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr "ladatun alueen ulkopuolella"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} koostuu:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} poistettu)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr "Muuta GPX-tasoksi"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6126,7 +6572,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6136,442 +6582,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "Nimi"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr "Lue GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Ei aikaleimaa pisteelle {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Aikaleimaa \"{0}\" ei voitu lukea pisteestä {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr "Ei löytynyt aikaleimallisia kuvia."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Luetaan {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr "Geo-merkityt kuvat"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr "aikavyöhyke-ero: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "kuva"
-msgstr[1] "kuvat"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "Tahdista kello"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG-kuvat (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Päivämäärää tiedostosta \"{0}\" ei voitu tulkita."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Tiedostossa \"{0}\" ei ole EXIF-aikaleimaa."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "Kuva"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Syötä näytetty päivämäärä (kk/pp/vvvv TT:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr "GPS-yksikön aikavyöhyke (ero kuvaan)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr "Tahdista aika GPS-yksikön kanssa"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr "Syötettyä aikaa ei voitu tulkita oikein."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr "gps-piste"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "Muokkaa viivanpiirtotyyliä"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "Käytä globaaleja asetuksia."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr "Piirrä viivat pisteiden välillä tällä tasolla."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr "Älä piirrä viivoja pisteiden välillä tällä tasolla."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr "Viivanpiirtoasetukset"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "Muokkaa väriä"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Oletusarvo"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Valitse väri"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "Tuo äänitiedosto"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr "Ääniaaltotiedostot (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "Tuo kuvia"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} jälki, "
-msgstr[1] "{0} jälkeä, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} reitti, "
-msgstr[1] "{0} reittiä, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} reittipiste"
-msgstr[1] "{0} reittipistettä"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr "Nimi: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr "Kuvaus: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr "Ajanjakso: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr "Pituus: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "Muuta datatasoksi"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>Käsittelemättömän GPS-datan lähettämistä karttadatana pidetään "
-"haitallisena.<br>Jos haluat lähettää jälkiä, katso:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Muutettu jäljestä {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr "Lataa data OSM-palvelimelta tämän jäljen varrelta"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr "Lataa kaikki  alueella:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr "{0} metriä"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr "Yhden pyynnön enimmäisalue:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} neliökilometriä"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr "<html>Tämä vaatii {0} erillistä latauspyyntöä.<br>Jatketaanko?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr "Tasolla ei ole yhtään GPX-jälkeä, johon liittää äänitiedosto."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Datataso {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr "ladatun alueen ulkopuolella"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} koostuu:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} poistettu)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr "Muuta GPX-tasoksi"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -6943,5 +6952,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "Auto"
@@ -6958,16 +6967,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "Polkupyörä"
@@ -6995,14 +7006,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "Jalankulku (foot)"
@@ -7215,19 +7229,19 @@
 msgstr "Kieli"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr "Käytä sisäänrakennettuja oletusarvoja"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr ""
@@ -7358,35 +7372,11 @@
 msgstr "Välityspalvelimen salasana"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr "OSM-tilin salasana. Jätä tyhjäksi, jos et halua tallentaa salasanaa."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "Karttatietokantapalvelun URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "OSM-salasana"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -7747,7 +7737,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "Ei voitu lukea \"{0}\":aa"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -7852,7 +7842,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "Tuntematon rooli \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8010,23 +8000,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "Virheellinen salasana tai käyttäjänimi."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Varoitus: salasana lähetetään salaamattomana."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "Tallenna käyttäjänimi ja salasana (salaamattomana)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
 msgstr "Kirjaudu sisään"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr "OSM-tilin salasana. Jätä tyhjäksi, jos et halua tallentaa salasanaa."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "OSM-salasana"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -8189,14 +8203,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "Tuntematon tyyppi: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "Valmistellaan OSM-karttatietoja..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr "Vääränlainen pisteen id"
@@ -8650,5 +8664,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr "Kuvaus"
@@ -9057,5 +9071,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr "Virhe ladattaessa tiedostoa"
@@ -9380,5 +9394,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -9914,7 +9928,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr "vesi"
@@ -10097,7 +10111,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "nimi"
+msgstr ""
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10655,12 +10668,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "{0} metriä"
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0} piste"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -10798,5 +10811,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr "Kadunnimi"
@@ -11634,7 +11647,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr "rakennus"
@@ -11648,5 +11661,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr "alue"
@@ -11883,12 +11896,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "Ole hyvä ja valitse muokattava rivi."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "Poista taso"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
@@ -11901,7 +11912,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "Ei lähetettäviä muutoksia."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -11912,19 +11922,19 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr "Automaattinen lataus"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -11933,42 +11943,42 @@
 "resoluutiota"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr "Vaihda resoluutiota"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr "Tallenna WMS-taso tiedostoon"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr "Lataa WMS-taso tiedostosta"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr ""
@@ -12298,4 +12308,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12332,5 +12344,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr "Tiet"
@@ -12341,5 +12353,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Moottoritie"
@@ -12348,5 +12360,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr "Muokkaa moottoritien ominaisuuksia"
@@ -12373,8 +12385,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr "Numero"
@@ -12415,21 +12427,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr "Taso"
@@ -12443,8 +12455,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr "Kaistat"
@@ -12462,15 +12474,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr "Maksiminopeus (km/h)"
@@ -12507,16 +12519,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr "Yksisuuntainen"
@@ -12558,19 +12570,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Silta"
@@ -12606,19 +12618,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr "Tunneli"
@@ -12652,18 +12664,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr "Maaleikkaus"
@@ -12697,18 +12709,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr "Penger"
@@ -12716,5 +12728,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr "Moottoritien ramppi"
@@ -12723,5 +12735,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr "Muokkaa rampin ominaisuuksia"
@@ -12729,5 +12741,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr "Valtatie/moottoriliikennetie (trunk)"
@@ -12736,5 +12748,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr "Muokkaa valtatien ominaisuuksia"
@@ -12744,6 +12756,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr ""
@@ -12751,5 +12763,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr "Valtatien/moottoriliikennetien ramppi (trunk_link)"
@@ -12758,5 +12770,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr "Muokkaa rampin ominaisuuksia"
@@ -12769,5 +12781,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Kantatie (primary)"
@@ -12776,5 +12788,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr "Muokkaa kantatien ominaisuuksia"
@@ -12782,10 +12794,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr "Kantatien ramppi (primary_link)"
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr "Muokkaa rampin ominaisuuksia"
@@ -12797,5 +12809,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Seututie (secondary)"
@@ -12805,5 +12817,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr "Muokkaa seututien ominaisuuksia"
@@ -12811,5 +12823,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr "Yhdystie/paikallistie"
@@ -12819,5 +12831,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr "Muokkaa yhdystien/paikallistien ominaisuuksia"
@@ -12829,5 +12841,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Tie (ei asuinkatu)"
@@ -12837,5 +12849,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr "Muokkaa tien ominaisuuksia"
@@ -12862,19 +12874,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr ""
@@ -12886,5 +12898,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Asuinkatu"
@@ -12893,5 +12905,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr "Muokkaa asuinkadun ominaisuuksia"
@@ -12915,13 +12927,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr "Pinta"
@@ -12941,20 +12953,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr "päällystetty"
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr "päällystämätön"
@@ -12962,12 +12974,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr "mukulakivi"
@@ -12975,5 +12987,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr "Pihakatu"
@@ -12982,5 +12994,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr "Muokkaa pihakadun ominaisuuksia"
@@ -12988,5 +13000,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr ""
@@ -12995,5 +13007,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr ""
@@ -13003,18 +13015,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr ""
@@ -13022,5 +13034,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr "Pysäköintialueen ajoväylä"
@@ -13030,5 +13042,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr "Muokkaa pysäköintialueen ajoväylän ominaisuuksia"
@@ -13036,5 +13048,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr "Tuntemattoman luokituksen tie"
@@ -13043,5 +13055,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr "Muokkaa tietä jonka luokitusta ei vielä tiedetä"
@@ -13050,20 +13062,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr "Liikennöintirajoitukset"
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr "Muokkaa tietä koskevia rajoituksia"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr "Tietulli"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr "Umpikuja"
@@ -13076,8 +13088,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr "Pääsy (access)"
@@ -13121,23 +13133,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr "kyllä"
@@ -13150,40 +13162,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr "yksityinen"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr ""
@@ -13196,19 +13208,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr "määränpää"
@@ -13231,65 +13243,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr ""
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr "ei"
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr "Pakettiautot (goods)"
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Raskaat ajoneuvot (3.5 tonnia) (hgv)"
@@ -13304,10 +13316,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr "Hevonen"
@@ -13323,13 +13335,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr "Moottoripyörä"
@@ -13345,30 +13357,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr "Auto"
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr "Julkinen liikenne (psv)"
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr "Moottorivene"
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr "Vene"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr "Miniminopeus (km/h)"
@@ -13376,25 +13388,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr "Maksimipaino (tonnia)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr "Kiertoliittymä"
@@ -13405,5 +13417,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr "Muokkaa kiertoliittymän/risteyksen ominaisuuksia"
@@ -13425,9 +13437,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr "Tyyppi"
@@ -13447,10 +13459,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr "moottoritie"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr "moottoritien_ramppi"
@@ -13472,10 +13484,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr "valtatie"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr "valtatien_ramppi"
@@ -13497,10 +13509,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr "kantatie"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr "kantatien_ramppi"
@@ -13522,6 +13534,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr "seututie"
@@ -13535,9 +13547,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr "yhdystie"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr "tie"
@@ -13551,9 +13563,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr "asuinkatu"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr "pihakatu"
@@ -13583,10 +13595,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr ""
@@ -13594,4 +13606,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13609,6 +13628,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr ""
@@ -13619,10 +13638,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr "Muokkaa sillan ominaisuuksia"
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr ""
@@ -13630,19 +13649,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr "Polut"
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr "Rakennettava tie"
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr "Muokkaa rakennettavan tien ominaisuuksia"
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr "Liittymä"
@@ -13658,5 +13677,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr "kiertoliittymä"
@@ -13665,5 +13684,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr "Ratsastustie"
@@ -13671,5 +13690,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr "Muokkaa ratsastustien ominaisuuksia"
@@ -13677,5 +13696,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr "Pyörätie"
@@ -13685,5 +13704,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr "Muokkaa pyörätietä/kevyen liikenteen väylää"
@@ -13691,5 +13710,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr "Jalankulkutie"
@@ -13698,5 +13717,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr "Muokkaa jalkakäytävän ominaisuuksia"
@@ -13704,5 +13723,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr "Kävelykatu"
@@ -13711,5 +13730,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr "Muokkaa kävelykadun ominaisuuksia"
@@ -13717,5 +13736,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr "Portaat"
@@ -13725,5 +13744,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr "Muokkaa portaiden ominaisuuksia"
@@ -13732,5 +13751,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr "Metsätie (track)"
@@ -13739,14 +13758,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr "Muokkaa metsätien ominaisuuksia"
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr "sora"
@@ -13754,18 +13773,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr "maa"
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr "ruoho"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr "hiekka"
@@ -13773,5 +13792,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr ""
@@ -13780,5 +13799,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr ""
@@ -13786,5 +13805,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr ""
@@ -13793,5 +13812,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr ""
@@ -13799,5 +13818,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr ""
@@ -13806,5 +13825,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr ""
@@ -13812,5 +13831,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr ""
@@ -13819,5 +13838,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr ""
@@ -13825,5 +13844,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr ""
@@ -13832,5 +13851,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -13839,5 +13858,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr "Polku"
@@ -13846,13 +13865,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr ""
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr "Moottorikelkka"
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr ""
@@ -13860,5 +13879,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr ""
@@ -13868,5 +13887,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr ""
@@ -13874,5 +13893,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr ""
@@ -13882,5 +13901,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr ""
@@ -13888,5 +13907,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr ""
@@ -13896,5 +13915,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr ""
@@ -13902,5 +13921,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr ""
@@ -13910,5 +13929,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr ""
@@ -13916,5 +13935,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr ""
@@ -13924,5 +13943,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr ""
@@ -13930,5 +13949,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr ""
@@ -13938,5 +13957,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr ""
@@ -13944,10 +13963,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr "Moottoritien liittymä"
@@ -13955,15 +13974,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr "Muokkaa moottoritien liittymää"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr ""
@@ -13971,5 +13990,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr ""
@@ -14004,14 +14023,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr "Operaattori"
@@ -14020,5 +14039,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr "Liikennevalot"
@@ -14028,5 +14047,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -14035,27 +14054,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr "saari"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr ""
@@ -14063,6 +14082,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr ""
@@ -14071,11 +14090,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -14083,30 +14102,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr ""
@@ -14114,5 +14133,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -14121,14 +14140,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr ""
@@ -14139,14 +14158,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr "Kääntöympyrä"
@@ -14156,20 +14175,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr "Nopeuskamera"
@@ -14177,5 +14196,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr "Hätäpuhelin"
@@ -14183,5 +14202,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr ""
@@ -14189,5 +14208,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr ""
@@ -14196,10 +14215,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr "Kahluupaikka"
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr ""
@@ -14207,5 +14226,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr ""
@@ -14213,5 +14232,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -14223,7 +14242,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr ""
@@ -14231,5 +14250,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr "Esteet"
@@ -14237,5 +14256,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr ""
@@ -14243,5 +14262,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr ""
@@ -14280,18 +14299,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr "Sallitut kulkumuodot:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr ""
@@ -14300,5 +14323,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr ""
@@ -14306,5 +14329,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr ""
@@ -14312,10 +14335,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr ""
@@ -14323,15 +14346,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr ""
@@ -14339,5 +14362,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr ""
@@ -14345,10 +14368,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr ""
@@ -14358,5 +14381,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr "Pensasaita"
@@ -14365,5 +14388,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr "Aita"
@@ -14372,5 +14395,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr "Muuri"
@@ -14378,5 +14401,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr "Kaupunginmuuri"
@@ -14385,5 +14408,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr ""
@@ -14395,15 +14418,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr "Portti"
@@ -14411,50 +14434,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr ""
@@ -14462,15 +14485,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+#, fuzzy
+msgid "Turnstile"
+msgstr "Kääntöpöytä"
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "Muokkaa linnan ominaisuuksia"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr ""
@@ -14481,10 +14516,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr "Vesi"
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr "Lähde"
@@ -14492,5 +14527,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr "Muokkaa lähteen ominaisuuksia"
@@ -14498,5 +14533,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr ""
@@ -14504,10 +14539,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr ""
@@ -14515,10 +14550,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr "Kanava"
@@ -14526,10 +14561,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr "Joki"
@@ -14539,5 +14574,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr "Muokkaa joen ominaisuuksia"
@@ -14545,15 +14580,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr "Muokkaa veden ominaisuuksia"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr "Maa"
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr "Muokkaa maan ominaisuuksia"
@@ -14561,15 +14596,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr "Tekojärvi"
@@ -14577,15 +14612,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr "Muokkaa tekojärven ominaisuuksia"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -14593,5 +14628,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr "Joentörmä"
@@ -14600,10 +14635,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr "Muokkaa joentörmän ominaisuuksia"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr "Kosteikko"
@@ -14614,14 +14649,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr "Muokkaa kosteikon ominaisuuksia"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr "suo"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr "räme"
@@ -14635,35 +14670,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr "suo"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr "Muta"
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr "Muokkaa mudan ominaisuuksia"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr "Ranta"
@@ -14671,20 +14706,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr "Muokkaa rannan ominaisuuksia"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr "Lahti"
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr "Muokkaa lahden ominaisuuksia"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr "Kallio"
@@ -14692,10 +14727,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr "Muokkaa kallion ominaisuuksia"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr "Rantaviiva"
@@ -14703,5 +14738,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr "Muokkaa rantaviivan ominaisuuksia"
@@ -14709,5 +14744,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr "Lauttareitti"
@@ -14715,5 +14750,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr ""
@@ -14722,5 +14757,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr ""
@@ -14728,10 +14763,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr "Telakka"
@@ -14739,5 +14774,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr ""
@@ -14745,5 +14780,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr "Pato"
@@ -14751,15 +14786,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr "Sulkuportti"
@@ -14768,5 +14803,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr ""
@@ -14774,20 +14809,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr "Vesiputous"
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr "Muokkaa vesiputouksen ominaisuuksia"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr ""
@@ -14796,15 +14831,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr "Venesatama"
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr "Laituri"
@@ -14812,10 +14847,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr "Muokkaa laiturin ominaisuuksia"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr "Lauttaterminaali"
@@ -14823,10 +14858,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr "Muokkaa lauttaterminaalin ominaisuuksia"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr ""
@@ -14836,5 +14871,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr ""
@@ -14842,10 +14877,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr "Rata"
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr "Rata"
@@ -14853,5 +14888,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr ""
@@ -14881,8 +14916,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr ""
@@ -14896,35 +14931,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr "sivuraide"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr "Kapean raideleveyden rata"
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr "Muokkaa kapean raideleveyden rataa"
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr "Monorail"
@@ -14932,45 +14967,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr ""
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr "Säilytetty"
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr "Muokkaa museroradan ominaisuuksia"
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr "Pikaraitiotie"
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr "Metro"
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr "Muokkaa metron ominaisuuksia"
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr "Raitiotie"
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr ""
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr ""
@@ -14978,5 +15013,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -14985,14 +15020,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr "Käytöstä poistettu rata"
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr "Muokkaa käytöstä poistetun radan ominaisuuksia"
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr "Purettu rata"
@@ -15001,5 +15036,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr "Tasoristeys"
@@ -15008,5 +15043,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr "Risteys"
@@ -15016,5 +15051,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr ""
@@ -15022,5 +15057,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr "Kääntöpöytä"
@@ -15029,10 +15064,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr "Köysiradat"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr "Tuolihissi"
@@ -15040,10 +15075,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr "Hiihtohissi"
@@ -15051,10 +15086,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr "Muokkaa hiihtohissin ominaisuuksia"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr "Köysirata"
@@ -15062,10 +15097,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr "Muokkaa köysiradan ominaisuuksia"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr ""
@@ -15073,5 +15108,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr ""
@@ -15079,5 +15114,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr "Asema"
@@ -15088,10 +15123,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr ""
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr "Polttoaine"
@@ -15101,5 +15136,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr "Muokkaa huoltoaseman ominaisuuksia"
@@ -15115,5 +15150,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15123,5 +15158,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr "Muokkaa pysäköinnin ominaisuuksia"
@@ -15129,41 +15164,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr "Paikkojen lukumäärä"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr "monikerroksinen"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr "maanalainen"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr "Invapaikkojen lukumäärä"
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr "Maksu"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr "Autopesula"
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr "Muokkaa autopesulan ominaisuuksia"
@@ -15171,5 +15206,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr "Kauppa"
@@ -15177,15 +15212,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr "Muokkaa autokaupan ominaisuuksia"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr "Korjaamo"
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr "Muokkaa autokorjaamon ominaisuuksia"
@@ -15193,5 +15228,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr "Vuokraamo"
@@ -15200,10 +15235,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr "Muokkaa autovuokraamon ominaisuuksia"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr ""
@@ -15211,5 +15246,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr ""
@@ -15217,5 +15252,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr "Muokkaa pyörätelineen ominaisuuksia"
@@ -15224,5 +15259,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr "Muokkaa polkupyörävuokraamon ominaisuuksia"
@@ -15231,15 +15266,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr "Pyöräkauppa"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "Julkinen liikenne"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr ""
@@ -15247,5 +15282,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr "Rautatien seisake"
@@ -15253,5 +15288,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr "Muokkaa rautatien seisaketta"
@@ -15259,5 +15294,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr "Raitiovaunupysäkki"
@@ -15266,5 +15301,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr "Muokkaa raitiovaunupysäkkiä"
@@ -15272,5 +15307,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr "Asemalaituri"
@@ -15279,5 +15314,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr "Muokkaa laiturin asetuksia"
@@ -15289,5 +15324,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr ""
@@ -15295,10 +15330,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr "Alue"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr "Metron sisäänkäynti"
@@ -15307,10 +15342,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr "Muokkaa sisäänkäynnin ominaisuuksia"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr "Pyörätuoli"
@@ -15319,5 +15354,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr "Linja-autoasema"
@@ -15326,5 +15361,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr "Muokkaa linja-autoaseman ominaisuuksia"
@@ -15332,5 +15367,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr "Linja-autopysäkki"
@@ -15340,5 +15375,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr "Muokkaa linja-autopysäkin ominaisuuksia"
@@ -15349,6 +15384,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr ""
@@ -15356,10 +15391,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr ""
@@ -15367,5 +15402,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr "Taksi"
@@ -15373,5 +15408,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr "Muokkaa taksitolppaa"
@@ -15379,5 +15414,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr "Lentokenttä"
@@ -15385,15 +15420,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr "ICAO"
@@ -15402,5 +15437,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr "Majoittuminen"
@@ -15412,5 +15447,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotelli"
@@ -15419,15 +15454,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr "Muokkaa hotellia"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr "Tähdet"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr "Motelli"
@@ -15435,20 +15470,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr "Muokkaa motellin ominaisuuksia"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr "Vierasmaja"
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr "Muokkaa vierasmajan ominaisuuksia"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr "Alppimaja"
@@ -15456,10 +15491,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr "Hostelli"
@@ -15467,30 +15502,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr "Matkailuvaunualue"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr "Muokkaa matkailuvaunualueen ominaisuuksia"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr "Leirintäalue"
@@ -15498,10 +15533,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "Ruoka ja juoma"
@@ -15512,5 +15547,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ravintola"
@@ -15518,5 +15553,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr "Muokkaa ravintolan ominaisuuksia"
@@ -15524,5 +15559,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr ""
@@ -15530,61 +15565,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr "italialainen"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr "kiinalainen"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr "hampurilainen"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr "kreikkalainen"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr "saksalainen"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr "intialainen"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr "paikallinen"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr "turkkilainen"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr "aasialainen"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr "thaimaalainen"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr "meksikolainen"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr "japanilainen"
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr "Pikaruoka"
@@ -15592,9 +15627,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr "Muokkaa pikaruokalan ominaisuuksia"
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr "Kahvila"
@@ -15602,10 +15637,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr "Muokkaa kahvilan ominaisuuksia"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr ""
@@ -15613,20 +15648,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr ""
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr ""
@@ -15634,10 +15669,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr "Yökerho"
@@ -15645,20 +15680,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr "Muokkaa yökerhon ominaisuuksia"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "Turismi"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr "Nähtävyys"
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr ""
@@ -15667,11 +15702,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr "Aukioloajat"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "Museo"
@@ -15679,10 +15714,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr "Muokkaa museon ominaisuuksia"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "Eläintarha"
@@ -15691,10 +15726,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr "Muokkaa eläintarhan ominaisuuksia"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr "Näköalapaikka"
@@ -15702,25 +15737,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr "Muokkaa näköalapaikan ominaisuuksia"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr "Teemapuisto"
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr "Taideteos"
@@ -15728,5 +15763,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr ""
@@ -15734,5 +15769,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr ""
@@ -15740,80 +15775,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr ""
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "Kartta"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr ""
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr "kartta"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr ""
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr ""
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr "pyöräkartta"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
 msgid "Closer Description"
 msgstr ""
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1701
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Board Type"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "board"
 msgstr ""
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "history"
 msgstr "historia"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "wildlife"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Guidepost (Hiking)"
 msgstr ""
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr ""
@@ -15821,25 +15856,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr "Piknik-paikka"
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr "Muokkaa piknik-paikan ominaisuuksia"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "Historialliset paikat"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "Linna"
@@ -15848,20 +15883,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr "Muokkaa linnan ominaisuuksia"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "Rauniot"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr "Muokkaa raunioiden ominaisuuksia"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr "Arkeologinen kaivaus"
@@ -15870,10 +15905,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr ""
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr "Taistelukenttä"
@@ -15881,5 +15916,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr ""
@@ -15887,15 +15922,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr "Monumentti"
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr "Muistomerkki"
@@ -15903,45 +15938,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "Vapaa-ajanviete"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr "Vesipuisto"
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr "Muokkaa vesipuiston ominaisuuksia"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "Leikkipuisto"
@@ -15949,15 +15984,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr "Muokkaa leikkipuiston ominaisuuksia"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "Kalastus"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr ""
@@ -15965,15 +16000,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr "Muokkaa stadionin ominaisuuksia"
@@ -15987,6 +16022,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "Valitse urheilulaji:"
@@ -16009,4 +16044,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -16067,5 +16110,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16075,5 +16126,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16219,5 +16270,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16323,5 +16374,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16362,29 +16413,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr "urheilu"
@@ -16394,227 +16446,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr "jousiammunta"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr "australialainen jalkapallo"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr "koripallo"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr "kuulapelit"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr "kiipeily"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr "kriketti"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr "krikettiverkko"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr "kroketti"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr "pyöräily"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr "ratsastus"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr "amerikkalainen jalkapallo"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr "voimistelu"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr "jääkiekko"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr "ammunta"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "jalkapallo"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr "uinti"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "pöytätennis"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr "Urheilukeskus"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr "Muokkaa urheilukeskuksen ominaisuuksia"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr "Kenttä"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr "Muokkaa kentän ominaisuuksia"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr "Kilparata"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr "Muokkaa kilparadan ominaisuuksia"
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr "Golfkenttä"
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr "Muokkaa golf-kentän ominaisuuksia"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr "Pienoisgolf"
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr "Muokkaa minigolfin ominaisuuksia"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr "Urheilu"
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr ""
@@ -16653,191 +16705,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr "kenttä"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr "urheilukeskus"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr "Jousiammunta"
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr "Kiipeily"
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr ""
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr "Pyöräily"
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr "Ratsastus"
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr "Voimistelu"
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr "Moottoriurheilu"
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr "Muokkaa moottoriurheilun ominaisuuksia"
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr "Unti"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr ""
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr ""
@@ -16845,56 +16897,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr "Ammunta"
@@ -16902,178 +16954,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr "Pallopelit"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr "Jalkapallo"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr "Amerikkalainen jalkapallo"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr "Australialainen jalkapallo"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr "Koripallo"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr "golfkenttä"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr "Kuulapeli"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr "Muokkaa kuulapelin ominaisuuksia"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr "Kriketti"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr "Muokkaa kriketin ominaisuuksia"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr "Krikettiverkko"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr "Muokkaa krikettiverkon ominaisuuksia"
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr "Kroketti"
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr "Jääkiekko"
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr "Muokkaa jääkiekkopaikan ominaisuuksia"
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr "Pöytätennis"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "Rakennukset"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr "Rakennus"
@@ -17081,5 +17133,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "Julkinen rakennus"
@@ -17087,10 +17139,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr "Muokkaa julkisen rakennuksen ominaisuuksia"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "Kaupungintalo"
@@ -17098,10 +17150,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "Muokkaa kaupungintalon ominaisuuksia"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "Suurlähetystö"
@@ -17109,10 +17161,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "Muokkaa suurlähetystön ominaisuuksia"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "Oikeustalo"
@@ -17121,10 +17173,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "Muokkaa oikeustalon ominaisuuksia"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "Vankila"
@@ -17133,10 +17185,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "Muokkaa vankilan ominaisuuksia"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "Poliisiasema"
@@ -17146,10 +17198,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "Muokkaa poliisiaseman ominaisuuksia"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "Paloasema"
@@ -17158,10 +17210,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "Muokkaa paloaseman ominaisuuksia"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "Postitoimisto"
@@ -17169,5 +17221,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr "Muokkaa postitoimiston ominaisuuksia"
@@ -17175,15 +17227,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr "Lastentarha"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr "Muokkaa lastentarhan ominaisuuksia"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "Koulu"
@@ -17191,10 +17243,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "Muokkaa koulun ominaisuuksia"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr "Yliopisto"
@@ -17202,10 +17254,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr "Muokkaa yliopiston ominaisuuksia"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr "Korkeakoulu"
@@ -17213,5 +17265,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr "Muokkaa korkeakoulun ominaisuuksia"
@@ -17219,5 +17271,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "Elokuvateatteri"
@@ -17226,10 +17278,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "Muokkaa elokuvateatterin ominaisuuksia"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "Kirjasto"
@@ -17238,10 +17290,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "Muokkaa kirjaston ominaisuuksia"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr "Taidekeskus"
@@ -17249,10 +17301,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr "Muokkaa taidekeskuksen ominaisuuksia"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "Teatteri"
@@ -17261,10 +17313,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "Muokkaa teatterin ominaisuuksia"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr ""
@@ -17274,5 +17326,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr ""
@@ -17281,6 +17333,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr "Uskonto"
@@ -17289,66 +17341,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr ""
@@ -17357,81 +17409,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr "Osoitteet"
@@ -17440,5 +17492,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr "Muokkaa osoitetietoja"
@@ -17446,5 +17498,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr "Talon numero"
@@ -17452,20 +17504,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr "Talon nimi"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr "Kaupungin nimi"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "Postinumero"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr "Maakoodi"
@@ -17473,5 +17525,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr "Talonumeroiden interpolointilinja"
@@ -17480,5 +17532,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr "Muokkaa interpolointilinjaa"
@@ -17486,71 +17538,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr "pariton"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr "parillinen"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr "kaikki"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr "Tehdas"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr "Muokkaa tehtaan ominaisuuksia"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "Torni"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "Muokkaa tornin ominaisuuksia"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "Vesitorni"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "Muokkaa vesitornin ominaisuuksia"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr "Kaasukello"
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr "Muokkaa kaasukellon ominaisuuksia"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "Majakka"
@@ -17558,10 +17610,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "Muokkaa majakan ominaisuuksia"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "Tuulimylly"
@@ -17569,10 +17621,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "Muokkaa tuulimyllyn ominaisuuksia"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "Putki"
@@ -17580,10 +17632,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "Muokkaa putken ominaisuuksia"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr "Vedenpuhdistuslaitos"
@@ -17593,10 +17645,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr "Muokkaa vedenpuhdistuslaitoksen ominaisuuksia"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr "Nosturi"
@@ -17604,10 +17656,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr "Muokkaa nosturin ominaisuuksia"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr "Loisto"
@@ -17615,10 +17667,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr ""
@@ -17626,10 +17678,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr "Valvontakamera"
@@ -17637,5 +17689,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr "Muokkaa valvontakameran ominaisuuksia"
@@ -17643,5 +17695,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr ""
@@ -17651,39 +17703,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr "tuuli"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr "vesivoima"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr "fossiilinen polttoaine"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr "ydinvoima"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr "kivihiili"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr "kaasu"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr ""
@@ -17692,10 +17744,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr "Muuntamoasema"
@@ -17704,5 +17756,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr "Muokkaa muuntamoaseman ominaisuuksia"
@@ -17710,10 +17762,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr "Korkeajännitelinjan torni"
@@ -17724,5 +17776,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr "Muokkaa korkeajännitelinjan tornin ominaisuuksia"
@@ -17730,5 +17782,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr "Sähkölinja"
@@ -17737,25 +17789,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr "Muokkaa sähkölinjan ominaisuuksia"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr "Jännite"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr "Johtojen määrä"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "Käymälä"
@@ -17763,20 +17815,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr "Postilaatikko"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "Puhelin"
@@ -17785,5 +17837,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr "Muokkaa puhelimen ominaisuuksia"
@@ -17791,5 +17843,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "Kolikot"
@@ -17797,5 +17849,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr ""
@@ -17803,5 +17855,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -17809,5 +17861,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr ""
@@ -17815,15 +17867,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "Luottokortit"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "Puhelinkortit"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr "Kierrätys"
@@ -17832,5 +17884,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr "Muokkaa kierrätyspisteen ominaisuuksia"
@@ -17838,35 +17890,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr "Paristot"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr "Peltitölkit"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr "Vaatteet"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr "Lasi"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr "Paperi"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr "Romumetalli"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr "Penkki"
@@ -17875,20 +17927,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr "Metsästyslava"
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr "Muokkaa metsästyslavan ominaisuuksia"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr ""
@@ -17896,22 +17948,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr "Korkeus"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr "täysi"
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr "Lähde"
@@ -17920,10 +17972,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr "Muokkaa lähteen ominaisuuksia"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "Juomavesi"
@@ -17932,10 +17984,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "Muokkaa juomaveden ominaisuuksia"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr ""
@@ -17943,25 +17995,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "Kaupat"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr "Lähikauppa"
@@ -17969,10 +18021,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr "Muokkaa lähikaupan tietoja"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr "Kioski"
@@ -17980,10 +18032,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr "Muokkaa kioskin ominaisuuksia"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "Automaatti"
@@ -17991,5 +18043,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "Muokkaa automaatin tietoja"
@@ -17997,88 +18049,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "Automaatin tuotteet"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "juomat"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "Lihakauppa"
@@ -18086,10 +18138,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "Muokkaa lihakaupan ominaisuuksia"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "Leipomo"
@@ -18097,10 +18149,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "Muokkaa leipomon ominaisuuksia"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr ""
@@ -18108,20 +18160,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr ""
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr "Luomukauppa"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr "Muokkaa luomukaupan ominaisuuksia"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr ""
@@ -18129,60 +18181,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr ""
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr ""
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr ""
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr ""
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr ""
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr ""
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr ""
@@ -18190,10 +18242,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr ""
@@ -18201,10 +18253,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr "Tee-se-itse-kauppa"
@@ -18212,60 +18264,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr "Muokkaa tee-se-itse-kaupan ominaisuuksia"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr ""
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr "Kampaamo"
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr "Muokkaa kampaamon ominaisuuksia"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr ""
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr ""
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "Kuivapesula"
@@ -18273,10 +18325,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "Muokkaa kuivapesulan ominaisuuksia"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "Pesula"
@@ -18284,10 +18336,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "Muokkaa pesulan ominaisuuksia"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr ""
@@ -18295,35 +18347,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr ""
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr "Muokkaa optikon ominaisuuksia"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "Raha"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "Pankki"
@@ -18331,5 +18383,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "Muokkaa pankin ominaisuuksia"
@@ -18337,10 +18389,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "Pankkiautomaatti"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr "Rahanvaihto"
@@ -18348,5 +18400,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr "Muokkaa rahanvaihdon ominaisuuksia"
@@ -18354,15 +18406,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "Muokkaa pankkiautomaatin ominaisuuksia"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "Terveys"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr "Lääkäri"
@@ -18370,20 +18422,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr "Muokkaa lääkärin ominaisuuksia"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr "Hammaslääkäri"
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr "Muokkaa hammaslääkärin ominaisuuksia"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "Apteekki"
@@ -18391,5 +18443,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "Muokkaa apteekin ominaisuuksia"
@@ -18397,10 +18449,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "Sairaala"
@@ -18408,10 +18460,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "Muokkaa sairaalan ominaisuuksia"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr ""
@@ -18420,5 +18472,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -18427,20 +18479,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr "Puhelinnumero"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -18448,5 +18500,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr "Eläinlääkäri"
@@ -18455,56 +18507,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr "Muokkaa eläinlääkärin ominaisuuksia"
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr "Maanosa"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr "Muokkaa maanosan ominaisuuksia"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr "Maa"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr "Muokkaa maan ominaisuuksia"
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr "Osavaltio"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr "Muokkaa osavaltion ominaisuuksia"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr "Seutu"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr ""
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr ""
@@ -18512,15 +18563,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr "Iso kaupunki"
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr "Muokkaa kaupungin ominaisuuksia"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr "Kaupunki"
@@ -18528,10 +18579,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr "Muokkaa kaupungin ominaisuuksia"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr "Kaupunginosa"
@@ -18539,25 +18590,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr "Muokkaa kaupunginosan ominaisuuksia"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "Kunta"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "Muokkaa kunnan ominaisuuksia"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr "Kylä"
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr "Muokkaa kylän ominaisuuksia"
@@ -18565,5 +18616,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr ""
@@ -18571,10 +18622,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "Saari"
@@ -18582,5 +18633,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "Muokkaa saaren ominaisuuksia"
@@ -18588,5 +18639,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr "Luolan suuaukko"
@@ -18594,10 +18645,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr "Muokkaa luolan suuaukon ominaisuuksia"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "Huippu"
@@ -18605,10 +18656,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "Muokkaa huipun ominaisuuksia"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr "Jäätikkö"
@@ -18616,10 +18667,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr "Muokkaa jäätikön ominaisuuksia"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr "Tulivuori"
@@ -18627,70 +18678,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr "Muokkaa tulivuoren ominaisuuksia"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr "Rajat"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr "Kansallinen"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr "Muokkaa kansallisen rajan ominaisuuksia"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr "Hallinnollinen"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr "Muokkaa hallinnollisen rajan ominaisuuksia"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr "Muokkaa poliittisen rajan ominaisuuksia"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr "Muokkaa kansallispuiston rajan ominaisuuksia"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr "Maankäyttö"
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "Puu"
@@ -18699,15 +18750,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "Muokkaa puun ominaisuuksia"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr "Kasvitieteellinen nimi"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr "Metsä"
@@ -18716,5 +18767,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr "Muokkaa metsän ominaisuuksia"
@@ -18722,17 +18773,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr "havumetsä"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr "lehtimetsä"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr "sekametsä"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "Talousmetsä"
@@ -18741,14 +18792,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr "Muokkaa talousmetsän ominaisuuksia"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr "Luonnonsuojelualue"
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -18756,25 +18807,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr "Kivikko, rakka"
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr "Muokkaa kivikon ominaisuuksia"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr "Pusikko"
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr "Muokkaa pusikon ominaisuuksia"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr "Tunturi"
@@ -18782,10 +18833,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr "Muokkaa tunturin ominaisuuksia"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr "Nummi"
@@ -18793,5 +18844,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr "Muokkaa nummen ominaisuuksia"
@@ -18799,5 +18850,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr "Maatilan piha/työskentelyalue (muu kuin pelto)"
@@ -18806,45 +18857,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr "Muokkaa maatilan pihan ominaisuuksia"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr "Peltoalueet"
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr "Viinitarha"
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr "Muokkaa viinitarhan ominaisuuksia"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr "Siirtolapuutarha"
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr "Muokkaa siirtolapuutarhan ominaisuuksia"
@@ -18852,25 +18903,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr "Puutarha"
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr "Ruoho"
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr "Muokkaa ruohon ominaisuuksia"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr ""
@@ -18878,10 +18929,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr ""
@@ -18889,20 +18940,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr "Puisto"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr "Muokkaa puiston ominaisuuksia"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr ""
@@ -18910,5 +18961,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -18916,15 +18967,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr "Asuinalue"
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr "Muokkaa asuinalueen ominaisuuksia"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr "Hautausmaa (pieni)"
@@ -18932,9 +18983,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr "Muokkaa pienen hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr "Hautausmaa"
@@ -18942,39 +18993,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr "Muokkaa hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr "Kaupallinen"
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr "Muokkaa kaupallisen alueen ominaisuuksia"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr "Toimistoalue"
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr "Muokkaa toimistoalueen ominaisuuksia"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr "Teollisuusalue"
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr "Muokkaa teollisuusalueen ominaisuuksia"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr "Rata-alue"
@@ -18982,15 +19033,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr "Muokkaa rata-alueen ominaisuuksia"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr "Sotilasvoimat"
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr "Muokkaa sotilasvoimien maa-alueen ominaisuuksia"
@@ -18998,55 +19049,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr "Rakennustyömaa"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr "Muokkaa rakennustyömaan ominaisuuksia"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr "Purettuja rakennuksia"
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr "Muokkaa purettujen rakennusten alueen ominaisuuksia"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr "Rakentamiselle raivattu alue"
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr "Muokkaa rakentamiselle raivatun alueen ominaisuuksia"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr "Kaatopaikka"
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr "Muokkaa kaatopaikan ominaisuuksia"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr "Louhos"
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr "Muokkaa louhoksen ominaisuuksia"
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr ""
@@ -19056,5 +19107,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr ""
@@ -19063,10 +19114,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr ""
@@ -19074,5 +19125,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr ""
@@ -19081,5 +19132,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -19087,34 +19138,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr "Kielto"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr ""
@@ -19123,15 +19174,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr ""
@@ -19139,5 +19190,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr ""
@@ -19146,5 +19197,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr ""
@@ -19152,5 +19203,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr ""
@@ -19222,24 +19273,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr "polkupyörä"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr ""
@@ -19292,20 +19343,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr ""
@@ -19319,10 +19370,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr ""
@@ -19330,26 +19381,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr ""
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "Kierrä"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr ""
@@ -19358,30 +19415,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr ""
@@ -19417,6 +19474,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19432,5 +19490,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19449,5 +19515,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr ""
@@ -19541,7 +19607,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr "silta"
@@ -19806,15 +19872,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr ""
@@ -19856,5 +19922,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr ""
@@ -19992,4 +20058,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20001,5 +20073,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20007,5 +20079,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20042,5 +20114,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20064,11 +20136,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr ""
@@ -20092,5 +20164,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20131,5 +20203,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20167,6 +20239,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr ""
@@ -20222,7 +20294,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr ""
@@ -20275,11 +20347,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr ""
@@ -20300,5 +20380,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr ""
@@ -20312,5 +20392,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr ""
@@ -20331,5 +20411,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr "kääntöympyrä"
@@ -20343,6 +20423,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr ""
@@ -20357,5 +20437,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr ""
@@ -20369,5 +20449,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr ""
@@ -20381,5 +20461,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr ""
@@ -20407,5 +20487,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr ""
@@ -20548,5 +20628,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20573,13 +20653,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr ""
@@ -20641,7 +20721,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr ""
@@ -20664,10 +20744,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr ""
@@ -20703,7 +20783,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr ""
@@ -20748,6 +20828,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr ""
@@ -20761,5 +20841,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr "terminaali"
@@ -20781,5 +20861,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr ""
@@ -20793,5 +20873,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr ""
@@ -20799,4 +20879,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20839,7 +20926,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr "köysirata"
@@ -20856,5 +20943,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr ""
@@ -20869,5 +20956,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr ""
@@ -20882,5 +20969,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr ""
@@ -20895,5 +20982,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr ""
@@ -20908,5 +20995,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr ""
@@ -20921,5 +21008,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr ""
@@ -20942,4 +21029,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -20950,4 +21044,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -21024,10 +21126,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr ""
@@ -21041,5 +21144,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr "laituri"
@@ -21053,5 +21156,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr ""
@@ -21179,12 +21282,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr ""
@@ -21198,5 +21301,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr ""
@@ -21268,8 +21371,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr ""
@@ -21371,10 +21474,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr ""
@@ -21394,4 +21497,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21413,4 +21523,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21734,4 +21851,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -21758,24 +21883,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr ""
@@ -21807,6 +21940,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr ""
@@ -21867,8 +22000,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr ""
@@ -22221,26 +22354,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr "kauppa"
@@ -22295,5 +22428,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22312,8 +22445,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr "hotelli"
@@ -22463,9 +22596,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr "turismi"
@@ -22537,8 +22670,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr "historiallinen"
@@ -22609,8 +22742,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr ""
@@ -22624,5 +22757,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr "louhos"
@@ -22636,5 +22769,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr "kaatopaikka"
@@ -22656,5 +22789,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr "valuma-alue"
@@ -22668,5 +22801,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr "talousmetsä"
@@ -22680,5 +22813,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr ""
@@ -22701,5 +22834,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr ""
@@ -22713,5 +22846,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr ""
@@ -22725,5 +22858,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr ""
@@ -22737,5 +22870,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr ""
@@ -22749,5 +22882,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr ""
@@ -22804,7 +22937,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr ""
@@ -22818,5 +22951,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr "hautausmaa"
@@ -22829,5 +22962,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr "huippu"
@@ -22842,5 +22975,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr "jäätikkö"
@@ -22854,5 +22987,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr "tulivuori"
@@ -22907,8 +23040,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr ""
@@ -22922,5 +23055,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr "pusikko"
@@ -22934,5 +23067,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr "nummi"
@@ -22946,5 +23079,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr "metsä"
@@ -22958,5 +23091,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr "muta"
@@ -22970,5 +23103,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr "ranta"
@@ -23046,8 +23179,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr "reitti"
@@ -23095,7 +23228,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr "raja"
@@ -23237,10 +23370,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr ""
@@ -23288,6 +23421,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr "osoite"
@@ -23584,57 +23717,54 @@
 msgstr ""
 
+#~ msgid "Aborting..."
+#~ msgstr "Keskeytetään..."
+
+#~ msgid "Add Selected"
+#~ msgstr "Lisää valitut"
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "Lisää valitut objektit jäseniksi"
+
+#~ msgid "Revert"
+#~ msgstr "Palauta"
+
+#~ msgid "Date"
+#~ msgstr "Päivämäärä"
+
+#~ msgid "Object"
+#~ msgstr "Objekti"
+
+#~ msgid "Not implemented yet."
+#~ msgstr "Ominaisuutta ei ole vielä toteutettu."
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)."
+
+#~ msgid "Email"
+#~ msgstr "Sähköpostiosoite"
+
 #~ msgid "Unknown file extension."
 #~ msgstr "Tuntematon tiedostopääte."
 
+#~ msgid "Remove the member in the current table row from this relation"
+#~ msgstr "Poista taulukon aktiivisella rivillä oleva jäsen relaatiosta"
+
+#~ msgid "Error parsing server response."
+#~ msgstr "Virhe palvelimen vastauksen käsittelyssä."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM-käyttäjänimi (sähköpostiosoite)"
+
+#~ msgid "my version:"
+#~ msgstr "minun versioni:"
+
+#~ msgid "their version:"
+#~ msgstr "palvelimen versio:"
+
+#~ msgid "Change"
+#~ msgstr "Muokkaa"
+
 #~ msgid "Move"
 #~ msgstr "Siirrä"
-
-#~ msgid "Aborting..."
-#~ msgstr "Keskeytetään..."
-
-#~ msgid "Add Selected"
-#~ msgstr "Lisää valitut"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Lisää valitut objektit jäseniksi"
-
-#~ msgid "Revert"
-#~ msgstr "Palauta"
-
-#~ msgid "Date"
-#~ msgstr "Päivämäärä"
-
-#~ msgid "Object"
-#~ msgstr "Objekti"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Ominaisuutta ei ole vielä toteutettu."
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)."
-
-#~ msgid "Email"
-#~ msgstr "Sähköpostiosoite"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Poista taulukon aktiivisella rivillä oleva jäsen relaatiosta"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Virhe palvelimen vastauksen käsittelyssä."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM-käyttäjänimi (sähköpostiosoite)"
-
-#~ msgid "my version:"
-#~ msgstr "minun versioni:"
-
-#~ msgid "their version:"
-#~ msgstr "palvelimen versio:"
-
-#~ msgid "Rotate"
-#~ msgstr "Kierrä"
-
-#~ msgid "Change"
-#~ msgstr "Muokkaa"
 
 #~ msgid "position"
Index: /applications/editors/josm/i18n/po/fr.po
===================================================================
--- /applications/editors/josm/i18n/po/fr.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/fr.po	(revision 17069)
@@ -6,7 +6,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
-"PO-Revision-Date: 2009-08-04 10:43+0000\n"
-"Last-Translator: Sébastien Beaujard <seb@sebandjohn.fr>\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
+"PO-Revision-Date: 2009-08-11 07:06+0000\n"
+"Last-Translator: nin2jardin <Unknown>\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: 2009-08-10 11:57+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -54,6 +54,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -63,5 +63,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -98,6 +98,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "Erreur"
@@ -110,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "Modifications non enregistrées"
@@ -130,10 +130,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -150,15 +150,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -188,6 +188,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -217,5 +217,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -369,15 +369,15 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Please select the target layer."
-msgstr ""
+msgstr "Veuillez sélectionner le calque de destination."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 msgid "Select target layer"
-msgstr ""
+msgstr "Sélectionnez le calque de destination"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
-msgstr ""
+msgstr "Fusionner"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -387,8 +387,10 @@
 "</html>"
 msgstr ""
+"<html>Il n’y a pas de calque vers lequel <br>\"{0}\"</br> le calque source "
+"puisse être fusionné.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 msgid "No target layers"
-msgstr ""
+msgstr "Pas de calque de destination"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
@@ -459,9 +461,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -494,7 +496,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -583,37 +585,37 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "les données"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "le calque"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "la sélection"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "le conflit"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "téléchargement"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zoom sur {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zoomer la vue sur {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -623,31 +625,31 @@
 msgstr "Afficher : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "Rien de sélectionné sur lequel zoomer."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "Aucun conflit sur lequel zoomer"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "Fusionner des chemins"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "Fusionner plusieurs chemins en un seul."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "Veuillez sélectionner au moins deux chemins à fusionner."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr ""
 "Fusionner des chemins qui ne sont pas les mêmes membres d’une relation ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -657,13 +659,13 @@
 "Voulez-vous encore les fusionner ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "Fusionner quand même"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "Changer les directions ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -673,10 +675,10 @@
 "la même direction. En retourner certaines ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "Inverser et fusionner"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -684,20 +686,20 @@
 msgstr "Entrer des valeurs pour tous les conflits."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Résoudre les conflits"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Fusionner {0} voies"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "Toutes les voies étaient vides"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -732,5 +734,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr ""
+msgstr "Ces nœuds ne sont pas en cercle. Abandon."
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -746,6 +748,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -767,6 +769,6 @@
 msgstr "Supprimer les objets sélectionnés."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -776,5 +778,5 @@
 msgstr "Écrire dessus"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -823,13 +825,15 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download referrers from OSM..."
-msgstr ""
+msgstr "Téléchargement des référents depuis OSM..."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download primitives referring to one of the selected primitives"
 msgstr ""
+"Téléchargement des primitives faisant référence à une des primitives "
+"sélectionnées"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42
 msgid "Download referrers..."
-msgstr ""
+msgstr "Téléchargement des référents..."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
@@ -845,5 +849,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
 msgid "Conflicts during download"
-msgstr ""
+msgstr "Conflits durant le téléchargement"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
@@ -906,7 +910,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "Exporter les données vers un fichier GPX."
+msgstr "Exporter en fichier GPX"
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -922,5 +925,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -938,5 +941,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -1005,28 +1008,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
 msgid "Merge layer"
-msgstr ""
+msgstr "Fusionner le calque"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
 msgid "Merge the current layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+msgstr "Fusionne le calque courant avec un autre calque"
+
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "Fusionner les nœuds"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "Fusionner les nœuds sur le plus ancien"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "Veuillez sélectionner au moins deux nœuds à fusionner."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr "Fusionner des nœuds qui ne sont pas les mêmes membres d’une relation ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1036,9 +1039,9 @@
 "vous encore les fusionner ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "Fusionner tout de même"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -1046,5 +1049,5 @@
 "encore utilisé"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1054,9 +1057,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 msgid "Merge selection"
-msgstr ""
+msgstr "Fusionner la sélection"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
 msgid "Merge the currently selected primitives into another layer"
-msgstr ""
+msgstr "Fusionne les primitives sélectionnées avec un autre calque"
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1137,4 +1140,6 @@
 msgid "<html>Could not read file ''{0}''. Error is: <br>{1}</html>"
 msgstr ""
+"<html>Lecture du fichier \"{0}\" impossible. L’erreur est : <br>{1}</br></"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
@@ -1267,5 +1272,5 @@
 #, java-format
 msgid "Could not rename file ''{0}''"
-msgstr ""
+msgstr "Impossible de renommer le fichier \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
@@ -1303,7 +1308,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "Pas d’intersection trouvée. Rien n’a été modifié."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1622,9 +1626,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
 msgid "No current dataset found"
-msgstr ""
+msgstr "Pas de jeu de données courant trouvé"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
 msgid "Didn't find a primitive with id {0} in the current dataset"
-msgstr ""
+msgstr "Pas de primitive d’id {0} trouvée dans le jeu de données courant."
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
@@ -1749,5 +1753,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
 msgid "upload all changes in one request"
-msgstr ""
+msgstr "Charger tous les changements dans une requête"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -1756,4 +1760,6 @@
 "changed primitive"
 msgstr ""
+"Permettre l'envoi de tous les changements en une requête, désactivez pour "
+"utiliser une requête par primitive modifiée"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464
@@ -1906,5 +1912,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
 msgid "Updating data"
-msgstr ""
+msgstr "Mise à jour des données"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
@@ -1917,5 +1923,5 @@
 msgstr "Erreurs durant le téléchargement"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1933,5 +1939,5 @@
 "ignorer.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr "Primitives supprimées ou déplacées"
@@ -1971,11 +1977,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2119,5 +2125,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2199,5 +2205,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Rechercher des objets."
@@ -2205,5 +2211,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
-msgstr ""
+msgstr "Impossible de rechercher car il n’y a pas de données chargées."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66
@@ -2331,5 +2337,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Chercher"
@@ -2522,5 +2528,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr ""
+msgstr "Double conflit"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
@@ -2538,5 +2544,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2581,5 +2587,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr "Supprimer de la relation"
@@ -2613,5 +2619,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr ""
+msgstr "Confirmation de suppression"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2621,9 +2627,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "Fusionner {0} nœuds"
-msgstr[1] "Fusionner {0} nœuds"
+msgstr[0] "Déplacer {0} nœud"
+msgstr[1] "Déplacer {0} nœuds"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2661,9 +2667,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "effectuer une rotation de {0}{1}"
-msgstr[1] "effectuer une rotation de {0}{1}"
+msgstr[0] "Tourner {0} nœud"
+msgstr[1] "Tourner {0} nœuds"
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2802,5 +2808,5 @@
 #, java-format
 msgid "already registered a conflict for primitive ''{0}''"
-msgstr ""
+msgstr "un conflit est déjà enregistré pour la primitive \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
@@ -2829,7 +2835,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "Changer {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2839,5 +2845,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2884,5 +2890,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2915,5 +2921,5 @@
 msgstr "le paramètre \"{0}\" n’est pas une classe acceptable, reçu \"{1}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2927,5 +2933,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "voie ferrée"
@@ -2940,5 +2946,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3163,9 +3169,9 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
 msgid "WGS84 Geographic"
-msgstr ""
+msgstr "WGS84 Geographic"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
 msgid "Gauss-Laborde Réunion 1947"
-msgstr ""
+msgstr "Gauss-Laborde Réunion 1947"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111
@@ -3206,13 +3212,13 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
 msgid "UTM20N Guadeloupe Fort-Marigot 1949"
-msgstr ""
+msgstr "UTM20N Guadeloupe Fort-Marigot 1949"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
 msgid "UTM20N Guadeloupe Ste-Anne 1948"
-msgstr ""
+msgstr "UTM20N Guadeloupe Ste-Anne 1948"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
 msgid "UTM20N Martinique Fort Desaix 1952"
-msgstr ""
+msgstr "UTM20N Martinique Fort Desaix 1952"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
@@ -3230,5 +3236,5 @@
 msgstr "Ne plus afficher"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3240,5 +3246,5 @@
 "Internet."
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3251,10 +3257,10 @@
 "d’erreur est :<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr "Condition préalable non remplie"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3262,25 +3268,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "inconnu"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3290,9 +3296,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3301,9 +3307,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "Exception inattendue"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3313,9 +3331,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "Hôte inconnu"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3328,5 +3346,5 @@
 "message d’erreur est :<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr "Primitive déjà supprimée"
@@ -3418,10 +3436,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "Nom d’utilisateur"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "Mot de passe"
@@ -3626,15 +3644,15 @@
 msgstr "(aucun objet)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "le calque n’est pas dans la liste."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "La couche \"{0}\" doit se trouver dans la liste des couches"
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3691,5 +3709,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr "Le mien et le leur"
@@ -3698,5 +3716,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr "Le mien et la fusion"
@@ -3705,20 +3723,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr "Le leur et la fusion"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr "le rôle {0} ne fait pas partie de la comparaison des paires {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3728,6 +3746,6 @@
 msgstr "Étiquettes"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3735,6 +3753,6 @@
 msgstr "Nœuds"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3742,23 +3760,23 @@
 msgstr "Membres"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr "Aucun conflit d’étiquette n'est résolu"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "Étiquettes ({0} conflits)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr "{0} étiquette(s) en conflit à résoudre"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr "Nœuds (résolus)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
@@ -3767,17 +3785,17 @@
 "la liste de nœuds de ce chemin"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "Nœuds (avec conflits)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr "Conflits à résoudre dans la liste des nœuds de ce chemin"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "Membres (résolus)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3787,74 +3805,74 @@
 "dans la liste des membres  de cette relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "Membres (avec conflits)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr "Conflits à résoudre dans la liste des membres de cette relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr "Pas de conflit de propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "Propriétés (avec conflits)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr "Des conflits de propriété sont en attente de résolution"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "Résolution de conflits"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr "paramètre en dehors de la plage : reçu {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr "la liste du rôle {0} ne participe pas à une comparaison de paire"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr "valeur du paramètre \"index\" inattendue. Reçu {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr "élément {0} non trouvé dans la liste"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr "figer le défilement"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr "Comparer "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr "Ma version"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr "Liste des éléments de mon jeu de données, i.e. les données locales"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr "Version fusionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3864,31 +3882,31 @@
 "décisions de fusion seront appliquées."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr "Leur version"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 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"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr "> haut"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 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"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr "> bas"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr ""
 "Copier mes éléments sélectionnés à la fin de la liste des éléments fusionnés"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3898,5 +3916,5 @@
 "liste des éléments fusionnés"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3906,5 +3924,5 @@
 "liste des éléments fusionnés"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
@@ -3912,5 +3930,5 @@
 "fusionnés"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr ""
@@ -3918,5 +3936,5 @@
 "fusionnés"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3926,5 +3944,5 @@
 "la liste des éléments fusionnés"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3934,21 +3952,21 @@
 "la liste des éléments fusionnés"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr "Monter"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr "Remonter les éléments sélectionnés d'un cran"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr "Descendre"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr "Descendre les éléments sélectionnés d'un cran"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3957,27 +3975,27 @@
 msgstr "Supprimer"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr "Supprimer les éléments sélectionnés de la liste des éléments fusionnés"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr "Figer"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr "Fige la liste courante des éléments fusionnés"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr "Libérer"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr "Libérer la liste courante des éléments fusionnés"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3987,5 +4005,5 @@
 "éléments avec les miens</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3996,5 +4014,5 @@
 "avec les miens</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -4003,5 +4021,5 @@
 msgstr[1] "Ma version ({0} éléments)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -4010,5 +4028,5 @@
 msgstr[1] "Version fusionnée ({0} éléments)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -4017,21 +4035,21 @@
 msgstr[1] "Leur version ({0} éléments)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -4041,5 +4059,5 @@
 msgstr "le paramètre {0} ne peut pas être vide"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -4049,5 +4067,5 @@
 msgstr "variable {0} non encore enregistrée."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -4055,9 +4073,9 @@
 msgstr "variable {0} non encore enregistrée"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr "Nœud"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4066,10 +4084,10 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr "index de colonne inattendu. Reçu {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -4080,19 +4098,19 @@
 "serveur<br>Détails :{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr "La communication avec le serveur a échoué"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr "Oui, les restaurer également"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr "Non, annuler l’opération"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -4103,9 +4121,9 @@
 "supprimés du serveur.<br><br>Voulez-vous les restaurer également ?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr "Restaurer ces nœuds également ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -4118,13 +4136,13 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr "Restaurer les primitives ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr "Propriétés de mon jeu de données, i.e. les données locales"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -4134,90 +4152,90 @@
 "éléments lorsque la fusion sera appliquée."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr "Propriétés de leur jeu de données, i.e. les données du serveur"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr "Coordonnées :"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr "Etat supprimé :"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr "État visible :"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr "(aucun)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "supprimé"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr "non supprimé"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr "visible (sur le serveur)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr "non visible (sur le serveur)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr "Garder une copie de la version locale"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr "Supprimer physiquement du jeu de données local"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr "Conserver mes coordonnées"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr "Conserver leurs coordonnées"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr "Ne pas résoudre le conflit de coordonnées"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr "Conserver mon état supprimé"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr "Conserver leur état supprimé"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr "Ne pas résoudre le conflit d'état"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr "Conserver mon état de visibilité"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr "Oui, réinitialiser l’id"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr "Non, annuler"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4230,17 +4248,17 @@
 "id<br>Êtes-vous d'accord ?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr "Réinitialisation de l’id à 0"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr "Conserver l'état de visbilité du serveur"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr "Oui, le supprimer"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4251,14 +4269,14 @@
 "données.<br>Êtes-vous d'accord ?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr "Suppression du jeu de données"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr "Conflit non résolu entre deux états de visiblité"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4266,10 +4284,10 @@
 msgstr "Rôle"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr "Primitive"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4277,12 +4295,12 @@
 "commande de résolution"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4290,8 +4308,8 @@
 msgstr "<non défini>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
@@ -4299,6 +4317,6 @@
 "Le jeu de données de la fusion n’incluera pas d’étiquette avec la clé {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4306,7 +4324,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4318,7 +4336,7 @@
 msgstr "Clé"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4331,5 +4349,5 @@
 msgstr "Valeur"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr ""
@@ -4338,40 +4356,40 @@
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, 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}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr "Ma version (jeu de données local)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr "Leur version (jeu de données du serveur)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ">"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Conserver la paire clé/valeur locale sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr "Conserver la paire clé/valeur distante sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr "Ne pas départager"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr "Marquer les étiquettes sélectionnées comme restant à départager"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4391,8 +4409,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4431,5 +4449,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4535,83 +4553,83 @@
 msgstr "Afficher l'historique de la primitive sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "Calques"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "Ouvrir une liste de tous les calques chargés."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "Supprimer le calque sélectionné."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr "Supprimer le calque"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "Montrer/Cacher"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "Bascule l'état de visibilité du calque sélectionné."
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "Déplacer le calque sélectionné un niveau vers le haut."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "Déplacer le calque sélectionné un niveau vers le bas."
@@ -4621,6 +4639,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4629,22 +4647,22 @@
 msgstr[1] "Cela modifiera {0} objets maximum."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "Une valeur vide supprime la clé."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<différent>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "Changer les valeurs ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4652,5 +4670,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4659,41 +4677,41 @@
 msgstr[1] "Modifier les propriétés de {0} objets maximum."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "Veuillez sélectionner une clé"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "Veuillez sélectionner une valeur"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 "Veuillez sélectionner les objets dont vous voulez changer les propriétés."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "Propriétés/Appartenances"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "Propriétés des objets sélectionnés."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "Membre de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "Ajouter des Propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4710,39 +4728,39 @@
 msgstr "Ajouter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 msgid "Add a new key/value pair to all objects"
 msgstr "Ajouter une nouvelle paire clé/valeur à tous les objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "Éditer les propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 msgid "Edit the value of the selected key for all objects"
 msgstr "Éditer la valeur de la clé selectionnée pour tous les objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propriétés : {0} / Appartenances : {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "Propriétés / Appartenances"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "Changer la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Supprimer vraiment la sélection de la relation {0} ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "Supprimer la clé sélectionnée de tous les objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "Supprimer les propriétés"
@@ -4754,5 +4772,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "Relations"
@@ -4786,31 +4804,31 @@
 "d'édition"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "Sélection actuelle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "Ouvrir une fenêtre de liste de sélection."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "Zoomer sur le(s) élément(s) sélectionné(s)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "Actualiser la liste de sélection."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "Zoomer sur la sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Sél.: Rel.:{0}/Chemins:{1}/Nœuds:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4818,5 +4836,5 @@
 msgstr "Sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4825,5 +4843,5 @@
 msgstr[1] "{0} voies"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4832,5 +4850,5 @@
 msgstr[1] "{0} relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5048,7 +5066,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "Supprimer la relation sélectionnée"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -5131,5 +5148,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5375,5 +5392,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "Lieux/endroits"
@@ -5420,21 +5437,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "type"
@@ -6244,72 +6261,522 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "Nom"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+"<html>Version <strong>{0}</strong> créée le <strong>{1}</strong> par <strong>"
+"{2}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr "Version {0} créée le {1} par {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr "Version"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr "Images pour {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr "Lecture GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Aucune heure pour le point {0}·x·{1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Impossible de lire l’heure \"{0}\" du point {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr "Aucune image avec des informations horaires lisibles trouvée."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "Lecture de {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr "Images géolocalisées"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr "Allumage du GPS : {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr "Extinction du GPS : {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr "variation différentielle actuelle : {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr "différence de fuseau horaire : "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "image"
+msgstr[1] "images"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} dans la trace."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "Synchroniser l’horloge"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "images JPEG (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, 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."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, 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}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "Image"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Entrez la date et l’heure montrées (mm/jj/aaaa HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr "Fuseau horaire de l'instrument GPS (différence avec la photo)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr "Synchroniser l’heure avec l’instrument GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr "La date indiquée ne peut être analysée."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr "point GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "Personnaliser le dessin des lignes"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr "Utiliser les réglages généraux."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr "Dessiner des lignes entre les points pour ce calque."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr "Ne pas dessiner de ligne entre les points pour ce calque."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr "Sélectionner les options de dessin des lignes"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "Personnaliser la couleur"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Par défaut"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Choisir une couleur"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr "Marqueurs depuis des points nommés"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Points de parcours nommés depuis {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "Importer Audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr "Fichiers audio Wave (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Marqueurs audio de {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "Importer des images"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} trace, "
+msgstr[1] "{0} traces, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} chemin, "
+msgstr[1] "{0} chemins, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} chemin"
+msgstr[1] "{0} chemins"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr "Nom : {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr "Description : {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr "Intervalle de temps : "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr "Longueur : "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "Convertir en calque de données"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+msgid ""
+"<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 mises en forme comme données<br>sur la "
+"carte est considéré comme nuisible.<br>Si vous voulez envoyer des traces, "
+"regardez ici :"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Converti depuis: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr "Télécharger depuis OSM le long de cette trace"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr "Tout télécharger dans un rayon de :"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr "{0} mètres"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr "Aire maximale par requête:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km²"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Cette action nécessitera {0} demandes<br>de téléchargement séparées. "
+"Voulez-vous<br>continuer ?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr ""
+"Aucune trace GPX disponible dans le calque pour l'associer avec le fichier "
+"audio."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"Des points avec un horodatage antérieur au début ou postérieur à la fin du "
+"chemin ont été omis ou déplacés au début."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Certains points dont la position est trop éloignée de la trace pour pouvoir "
+"estimer leur horodatage ont été omis."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Couche de données {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr "en dehors de la zone téléchargée"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr "version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+"Attention : le mélange de données 0.6 et 0.5 génère des données de version "
+"0.5"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} est consistué de :"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} supprimés)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr "non défini"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr "Version de l’API : {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr "Convertir en calque GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6318,7 +6785,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6328,455 +6795,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "Nom"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-"<html>Version <strong>{0}</strong> créée le <strong>{1}</strong> par <strong>"
-"{2}</strong></html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr "Version {0} créée le {1} par {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr "Version"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr "Images pour {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr "Lecture GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Aucune heure pour le point {0}·x·{1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Impossible de lire l’heure \"{0}\" du point {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr "Aucune image avec des informations horaires lisibles trouvée."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Lecture de {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr "Images géolocalisées"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr "Allumage du GPS : {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr "Extinction du GPS : {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr "variation différentielle actuelle : {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr "différence de fuseau horaire : "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "image"
-msgstr[1] "images"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} dans la trace."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "Synchroniser l’horloge"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "images JPEG (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, 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."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, 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}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "Image"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Entrez la date et l’heure montrées (mm/jj/aaaa HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr "Fuseau horaire de l'instrument GPS (différence avec la photo)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr "Synchroniser l’heure avec l’instrument GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr "La date indiquée ne peut être analysée."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr "point GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "Personnaliser le dessin des lignes"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "Utiliser les réglages généraux."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr "Dessiner des lignes entre les points pour ce calque."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr "Ne pas dessiner de ligne entre les points pour ce calque."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr "Sélectionner les options de dessin des lignes"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "Personnaliser la couleur"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Par défaut"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Choisir une couleur"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr "Marqueurs depuis des points nommés"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Points de parcours nommés depuis {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "Importer Audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr "Fichiers audio Wave (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Marqueurs audio de {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "Importer des images"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} trace, "
-msgstr[1] "{0} traces, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} chemin, "
-msgstr[1] "{0} chemins, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} chemin"
-msgstr[1] "{0} chemins"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr "Nom : {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr "Description : {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr "Intervalle de temps : "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr "Longueur : "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "Convertir en calque de données"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-msgid ""
-"<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 mises en forme comme données<br>sur la "
-"carte est considéré comme nuisible.<br>Si vous voulez envoyer des traces, "
-"regardez ici :"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Converti depuis: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr "Télécharger depuis OSM le long de cette trace"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr "Tout télécharger dans un rayon de :"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr "{0} mètres"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr "Aire maximale par requête:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km²"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Cette action nécessitera {0} demandes<br>de téléchargement séparées. "
-"Voulez-vous<br>continuer ?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr ""
-"Aucune trace GPX disponible dans le calque pour l'associer avec le fichier "
-"audio."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-"Des points avec un horodatage antérieur au début ou postérieur à la fin du "
-"chemin ont été omis ou déplacés au début."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Certains points dont la position est trop éloignée de la trace pour pouvoir "
-"estimer leur horodatage ont été omis."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Couche de données {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr "en dehors de la zone téléchargée"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr "version {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-"Attention : le mélange de données 0.6 et 0.5 génère des données de version "
-"0.5"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} est consistué de :"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} supprimés)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr "non défini"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr "Version de l’API : {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr "Convertir en calque GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -7183,5 +7200,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "Voiture"
@@ -7198,16 +7215,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "Vélos"
@@ -7235,14 +7254,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "Piétons"
@@ -7473,19 +7495,19 @@
 msgstr "Langue"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr "Activer les valeurs par défaut intégrées"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr "style utilisé"
@@ -7615,40 +7637,11 @@
 msgstr "Mot de passe du serveur mandataire"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr "URL de base du serveur OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr "Nom d'utilisateur (e-mail) du compte OSM."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"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."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "URL du serveur de base"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr "Nom d'utilisateur OSM (e-mail))"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "Mot de passe OSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
-"<html>ATTENTION : Le mot de passe est stocké en texte clair dans le fichier "
-"de préférences.<br>Le mot de passe est transféré en texte clair au serveur, "
-"encodé dans l'URL.<br><b>N'utilisez pas un mot de passe de valeur.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -8024,7 +8017,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "Impossible de lire \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -8131,7 +8124,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "Rôle inconnu \"{0}\"."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8299,23 +8292,52 @@
 msgstr "Fichier bz2 invalide."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "Mot de passe ou nom d’utilisateur incorrect."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Attention : Le mot de passe est transféré non-crypté."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "Sauvegarder l’utilisateur et le mot de passe (non crypté)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "Entrer le mot de passe"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
 msgstr "Identifiant"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr "Nom d'utilisateur (e-mail) du compte OSM."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"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."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr "Nom d'utilisateur OSM (e-mail))"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "Mot de passe OSM"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
+"<html>ATTENTION : Le mot de passe est stocké en texte clair dans le fichier "
+"de préférences.<br>Le mot de passe est transféré en texte clair au serveur, "
+"encodé dans l'URL.<br><b>N'utilisez pas un mot de passe de valeur.</b></html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -8496,14 +8518,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "Type de membre inconnu pour \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "Préparation des données de OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr "id du nœud mal formé"
@@ -8967,5 +8989,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr "Description"
@@ -9387,5 +9409,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr "Erreur lors du chargement du fichier"
@@ -9647,5 +9669,4 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
-#, fuzzy
 msgid ""
 "To enable the cadastre WMS plugin, change\n"
@@ -9653,6 +9674,4 @@
 "projection and retry"
 msgstr ""
-"Pour activer le greffon cadastre WMS, modifiez\n"
-"la projection JOSM en Lambert et redémarrez"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9747,5 +9766,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -10294,7 +10313,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr "eau"
@@ -10482,7 +10501,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "nom"
+msgstr ""
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -11057,12 +11075,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "début"
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0} nœud"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11204,5 +11222,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr "Nom de la rue"
@@ -12052,7 +12070,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr "bâtiment"
@@ -12066,5 +12084,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr "zone"
@@ -12328,17 +12346,14 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "Veuille sélectionnez la rangée à éditer."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "Sauvegarder la couche WMS"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Start adjusting"
-msgstr "Commencer la navigation"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
@@ -12347,7 +12362,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "Aucun changement à envoyer."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -12360,19 +12374,19 @@
 "Cela peut amener à de mauvaises coordonnées."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr "Téléchargement automatique"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Calque WMS ({0}), téléchargement automatique au zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Calque WMS ({0}), téléchargement au zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -12381,37 +12395,37 @@
 "résolution."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr "Télécharger les tuiles visibles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr "Changer la résolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr "Recharger les tuiles erronées"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr "Canal alpha"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr "Sauvegarder un calque WMS dans un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr "Sauvegarder la couche WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr "Charger un calque WMS depuis un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr "Charger la couche WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
@@ -12420,5 +12434,5 @@
 "attendue"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr "Erreur de format de fichier"
@@ -12802,4 +12816,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12836,5 +12852,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr "Rues"
@@ -12845,5 +12861,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Autoroute"
@@ -12852,5 +12868,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr "Éditer une autoroute"
@@ -12877,8 +12893,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr "Référence"
@@ -12919,21 +12935,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr "Calque"
@@ -12947,8 +12963,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr "Voies"
@@ -12966,15 +12982,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr "Vitesse max (km/h)"
@@ -13011,16 +13027,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr "Sens unique"
@@ -13062,19 +13078,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Pont"
@@ -13110,19 +13126,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -13156,18 +13172,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr "Découpe"
@@ -13201,18 +13217,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr "Remblai"
@@ -13220,5 +13236,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr "Bretelle d’accès d’autoroute"
@@ -13227,5 +13243,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr "Éditer une bretelle d’accès d’autoroute"
@@ -13233,5 +13249,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr "Voie rapide"
@@ -13240,5 +13256,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr "Éditer une voie rapide"
@@ -13248,6 +13264,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr "Route à accès réglementé"
@@ -13255,5 +13271,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr "Bretelle d’accès à une voie rapide"
@@ -13262,5 +13278,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr "Éditer une bretelle d’accès à une voie rapide"
@@ -13273,5 +13289,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Route primaire"
@@ -13280,5 +13296,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr "Éditer une route primaire"
@@ -13286,10 +13302,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr "Bretelle d’accès à une route primaire"
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr "Éditer une bretelle d’accès à une route primaire"
@@ -13301,5 +13317,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Route secondaire"
@@ -13309,5 +13325,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr "Éditer une route secondaire"
@@ -13315,5 +13331,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr "Route tertiaire"
@@ -13323,5 +13339,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr "Éditer une route tertiaire"
@@ -13333,5 +13349,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Route mineure"
@@ -13341,5 +13357,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr "Éditer une route mineure"
@@ -13366,19 +13382,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr "Largeur (mètres)"
@@ -13390,5 +13406,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Rue résidentielle"
@@ -13397,5 +13413,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr "Éditer une rue résidentielle"
@@ -13419,13 +13435,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr "Revêtement"
@@ -13445,20 +13461,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr "avec revêtement"
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr "sans revêtement"
@@ -13466,12 +13482,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr "pavés"
@@ -13479,5 +13495,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr "Rue résidentielle partagée entre usagers"
@@ -13486,5 +13502,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr "Éditer une rue résidentielle partagée entre usagers"
@@ -13492,5 +13508,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr "Voie de service"
@@ -13499,5 +13515,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr "Éditer une voie d’accès"
@@ -13507,18 +13523,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr "Type Voie de service"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr "allée"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr "acceso  para vehículos (entrada a garage, etc.)"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr "parking_aisle"
@@ -13526,5 +13542,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr "Voie de parking"
@@ -13534,5 +13550,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr "Éditer une voie de parking"
@@ -13540,5 +13556,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr "Route (type inconnu)"
@@ -13547,5 +13563,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr "Éditer une route de type inconnu"
@@ -13554,20 +13570,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr "Rue à accès restreint"
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr "Éditer les restrictions d’une route"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr "Péage"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr "Sans issue (cul-de-sac)"
@@ -13580,8 +13596,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr "Accès"
@@ -13625,23 +13641,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr "oui"
@@ -13654,40 +13670,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr "privé"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr "désigné"
@@ -13700,19 +13716,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr "destination"
@@ -13735,65 +13751,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr "permis par le propriétaire"
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr "véhicules agricoles"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr "non"
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr "Biens"
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Poids-lourds"
@@ -13808,10 +13824,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr "Cheval"
@@ -13827,13 +13843,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr "Motos"
@@ -13849,30 +13865,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr "Voitures"
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr "Véhicules de service public"
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr "Bateaux à moteur"
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr "Bateaux"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr "Vitesse min (km/h)"
@@ -13880,25 +13896,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr "Poids max (tonnes)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr "Hauteur max. (mètres)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr "Largeur max. (mètres)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr "Longueur max. (mètres)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr "Rond-point"
@@ -13909,5 +13925,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr "Éditer une jonction"
@@ -13929,9 +13945,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr "Type"
@@ -13951,10 +13967,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr "motorway"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr "motorway_link"
@@ -13976,10 +13992,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr "voie rapide"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr "trunk_link"
@@ -14001,10 +14017,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr "primary"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr "primary_link"
@@ -14026,6 +14042,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr "secondary"
@@ -14039,9 +14055,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr "tertiary"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr "unclassified"
@@ -14055,9 +14071,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr "residential"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr "living_street"
@@ -14087,10 +14103,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr "service"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr "bus_guideway"
@@ -14098,4 +14114,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -14113,6 +14136,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr "construction"
@@ -14123,10 +14146,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr "Éditer un pont"
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr "Modifier un tunnel"
@@ -14134,19 +14157,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr "Chemins"
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr "Construction"
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr "Éditer une route en construction"
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr "Jonction"
@@ -14162,5 +14185,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr "roundabout"
@@ -14169,5 +14192,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr "Chemin équestre"
@@ -14175,5 +14198,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr "Éditer un chemin équestre"
@@ -14181,5 +14204,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr "Voie cyclable"
@@ -14189,5 +14212,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr "Éditer une voie cyclable"
@@ -14195,5 +14218,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr "Voie piétonnière"
@@ -14202,5 +14225,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr "Éditer un chemin pour piétons"
@@ -14208,5 +14231,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr "Rue Piétonne"
@@ -14215,5 +14238,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr "Éditer une rue piétonne"
@@ -14221,5 +14244,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr "Escaliers"
@@ -14229,5 +14252,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr "Éditer des escaliers"
@@ -14236,5 +14259,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr "Piste"
@@ -14243,14 +14266,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr "Éditer une route carrossable sans revêtement"
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr "béton"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr "gravier"
@@ -14258,18 +14281,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr "terre"
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr "herbe"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr "sable"
@@ -14277,5 +14300,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr "Piste grade 1"
@@ -14284,5 +14307,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr "Éditer une piste grade 1"
@@ -14290,5 +14313,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr "Piste grade 2"
@@ -14297,5 +14320,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr "Éditer une piste grade 2"
@@ -14303,5 +14326,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr "Piste grade 3"
@@ -14310,5 +14333,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr "Éditer une piste grade 3"
@@ -14316,5 +14339,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr "Piste grade 4"
@@ -14323,5 +14346,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr "Éditer une piste grade 4"
@@ -14329,5 +14352,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr "Piste grade 5"
@@ -14336,5 +14359,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr "Éditer une piste grade 5"
@@ -14343,5 +14366,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr "Chemin partagé"
@@ -14350,13 +14373,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr "Editer le chemin"
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr "Motoneige"
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr "Ski"
@@ -14364,5 +14387,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr "Chemin de randonnée"
@@ -14372,5 +14395,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr "Éditer un chemin de randonnée"
@@ -14378,5 +14401,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr "Chemin de randonnée en montagne"
@@ -14386,5 +14409,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr "Éditer un chemin de randonnée en montagne"
@@ -14392,5 +14415,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr "Chemin de randonnée en montagne exigeant"
@@ -14400,5 +14423,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Éditer un chemin de randonnée en montagne exigeant"
@@ -14406,5 +14429,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr "Chemin de randonnée alpin"
@@ -14414,5 +14437,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr "Éditer un chemin de randonnée alpin"
@@ -14420,5 +14443,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr "Chemin de randonnée alpin exigeant"
@@ -14428,5 +14451,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Éditer un chemin de randonnée alpin exigeant"
@@ -14434,5 +14457,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr "Chemin de randonnée alpin difficile"
@@ -14442,5 +14465,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Éditer un chemin de randonnée alpin difficile"
@@ -14448,10 +14471,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr "Balises"
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr "Jonction autoroutière"
@@ -14459,15 +14482,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr "Éditer une jonction autoroutière"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr "Numéro"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr "Aire de repos"
@@ -14475,5 +14498,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr "Éditer une aire de repos"
@@ -14508,14 +14531,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr "Compagnie"
@@ -14524,5 +14547,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr "Feux tricolores"
@@ -14532,5 +14555,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr "Passage piéton"
@@ -14539,27 +14562,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr "non contrôlé"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr "feux tricolores"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr "île"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr "unmarked"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr "Traversée à cheval"
@@ -14567,6 +14590,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr "Traversée à vélo"
@@ -14575,11 +14598,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr "Aide à la traversée (personne)"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr "Nom du tpe de passage (UK)"
@@ -14587,30 +14610,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr "pélican"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr "pégase"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr "tigre"
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr "Stop"
@@ -14618,5 +14641,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr "Passage piéton"
@@ -14625,14 +14648,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr "Modifier passage piéton sur voie ferrée"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr "Type de nom (UK)"
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr "Mini-rond-point"
@@ -14643,14 +14666,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr "Direction"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr "sens horaire"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr "Petit élargissement pour demi-tour"
@@ -14660,20 +14683,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr "Limite de ville"
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr "Éditer un signe de limite de ville"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr "Nom secondaire"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr "Radar automatique"
@@ -14681,5 +14704,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr "Téléphone d'urgence"
@@ -14687,5 +14710,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr "Descente dangereuse"
@@ -14693,5 +14716,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr "Descente très dangereuse"
@@ -14700,10 +14723,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr "Gué"
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr "Modifier un gué"
@@ -14711,5 +14734,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr "Col de montagne"
@@ -14717,5 +14740,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr "Éditer un col de montagne"
@@ -14727,7 +14750,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr "Altitude"
@@ -14735,5 +14758,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr "Barrières"
@@ -14741,5 +14764,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr "Plot"
@@ -14747,5 +14770,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr "Modifier une bitte d'amarrage"
@@ -14784,18 +14807,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr "Trafic autorisé:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr "Barrière pour cycles"
@@ -14804,5 +14831,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr "Ruines"
@@ -14810,5 +14837,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr "Grille dans le sol"
@@ -14816,10 +14843,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr "Modifier une grille dans le sol"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr "Entrée de voie de bus (Allemagne)"
@@ -14827,15 +14854,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr "Pointes"
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr "Modifier pointes"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr "Péage"
@@ -14843,5 +14870,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr "Éditer un péage"
@@ -14849,10 +14876,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr "Douane"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr "Modifier douane"
@@ -14862,5 +14889,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr "Haie"
@@ -14869,5 +14896,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr "Barrière"
@@ -14876,5 +14903,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr "Mur"
@@ -14882,5 +14909,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr "Rempart"
@@ -14889,5 +14916,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr "Mur de soutènement"
@@ -14899,15 +14926,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr "Entrée"
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr "Editez une entrée"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr "Porte"
@@ -14915,50 +14942,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr "Editer une porte"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr "Barrière"
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr "Modifier une barrière"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr "Porte de clôture"
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr "Modifier une Porte de clôture"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr "Barrière mobile"
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr "Modifier une barrière mobile"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr "Portillon à chicane"
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr "Modifier un Portillon à chicane"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr "Échalier"
@@ -14966,15 +14993,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr "Modifier un échalier"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+#, fuzzy
+msgid "Turnstile"
+msgstr "Plaque tournante"
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "Modifier un échalier"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr "Écluse"
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr "Modifier une écluse"
@@ -14985,10 +15024,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr "Eau"
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr "Source"
@@ -14996,5 +15035,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr "Éditer une source"
@@ -15002,5 +15041,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr "Canal d’évacuation"
@@ -15008,10 +15047,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr "Éditer un canal d’évacuation"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr "Ruisseau"
@@ -15019,10 +15058,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr "Éditer un ruisseau"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr "Canal"
@@ -15030,10 +15069,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr "Éditer un canal"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr "Rivière"
@@ -15043,5 +15082,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr "Éditer une rivière"
@@ -15049,15 +15088,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr "Éditer de l’eau"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr "Terre"
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr "Editez un terrain"
@@ -15065,15 +15104,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr "Bassin"
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr "Éditer un bassin"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr "Bassin de retenue"
@@ -15081,15 +15120,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr "Éditer un bassin de retenue"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr "Réservoir couvert"
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr "Éditer un réservoir couvert"
@@ -15097,5 +15136,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr "Lit de rivière"
@@ -15104,10 +15143,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr "Modifier lit de rivière"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr "Zone inondable"
@@ -15118,14 +15157,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr "Modifier zone inondable"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr "marécages"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr "tourbière"
@@ -15139,35 +15178,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr "marais"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr "roselière"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr "marais salant"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr "étendue vaseuse"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr "mangrove"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr "Terrain boueux/vase"
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr "Éditer un terrain boueux"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr "Plage"
@@ -15175,20 +15214,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr "Éditer une plage"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr "Baie"
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr "Éditer une baie"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr "Falaise"
@@ -15196,10 +15235,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr "Éditer une falaise"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr "Ligne côtière"
@@ -15207,5 +15246,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr "Éditer une ligne côtière"
@@ -15213,5 +15252,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr "Itinéraire de ferry"
@@ -15219,5 +15258,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr "Éditer un itinéraire de ferry"
@@ -15226,5 +15265,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr "Chantier naval"
@@ -15232,10 +15271,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr "Éditer un chantier naval"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr "Dock"
@@ -15243,5 +15282,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr "Éditer un dock"
@@ -15249,5 +15288,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr "Barrage"
@@ -15255,15 +15294,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr "Éditer un barrage"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr "Voie navigable"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr "Écluse"
@@ -15272,5 +15311,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr "Petit barrage"
@@ -15278,20 +15317,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr "Éditer une écluse"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr "Cascade"
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr "Éditer une cascade"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr "Point de retournement"
@@ -15300,15 +15339,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr "Marina"
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr "Éditer une marina"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr "Jetée/Ponton"
@@ -15316,10 +15355,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr "Modifier jetée/ponton"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr "Terminal de Ferry"
@@ -15327,10 +15366,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr "Editer un terminal de Ferry"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr "Slipway"
@@ -15340,5 +15379,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr "Éditer un plan incliné"
@@ -15346,10 +15385,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr "Voie ferrée"
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr "Rail"
@@ -15357,5 +15396,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr "Éditer des rails"
@@ -15385,8 +15424,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr "Types optionels"
@@ -15400,35 +15439,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr "triage"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr "voie de garage"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr "embranchement"
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr "Voie ferrée étroite"
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr "Éditer une voie ferrée étroite"
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr "Monorail"
@@ -15436,45 +15475,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr "Éditer un monorail"
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr "Préservé"
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr "Éditer une voie ferrée touristique"
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr "Rails légers"
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr "Éditer des rails légers"
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr "Voie souterraine"
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr "Éditer un métro"
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr "Tram"
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr "Éditer un tram"
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr "Voie de guidage de bus"
@@ -15482,5 +15521,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr "Éditer une voie de guidage de bus"
@@ -15489,14 +15528,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr "Voie désaffectée"
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr "Éditer une voie désaffectée"
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr "Voie abandonnée"
@@ -15505,5 +15544,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr "Passage à niveau"
@@ -15512,5 +15551,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr "Passage piéton sur voie ferrée"
@@ -15520,5 +15559,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr "Type de passage"
@@ -15526,5 +15565,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr "Plaque tournante"
@@ -15533,10 +15572,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr "Transports aériens par câble"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr "Télésiège"
@@ -15544,10 +15583,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr "Éditer un télésiège"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr "Téléski"
@@ -15555,10 +15594,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr "Éditer un téléski"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr "Télécabine"
@@ -15566,10 +15605,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr "Éditer un télécabine"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr "Oeufs"
@@ -15577,5 +15616,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr "Modifier Oeufs"
@@ -15583,5 +15622,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr "Station"
@@ -15592,10 +15631,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr "Éditer la station"
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr "Station service"
@@ -15605,5 +15644,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr "Modifier station essence"
@@ -15619,5 +15658,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15627,5 +15666,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr "Éditer un parking"
@@ -15633,41 +15672,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr "Capacité"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr "surface"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr "parking (bâtiment)"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr "souterrain"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr "Automobiles en libre service"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr "Espaces pour handicapés"
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr "Péage/Forfait"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr "Lavage"
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr "Editez un espace de lavage de voitures"
@@ -15675,5 +15714,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr "Concession/Réparation"
@@ -15681,15 +15720,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr "Éditer une concession/réparation"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr "Réparer"
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr "Editez un garagiste"
@@ -15697,5 +15736,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr "Location"
@@ -15704,10 +15743,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr "Éditer une location de voiture"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr "Partage"
@@ -15715,5 +15754,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr "Éditer un covoiturage"
@@ -15721,5 +15760,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr "Éditer un parking à vélo"
@@ -15728,5 +15767,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr "Éditer une location de vélos"
@@ -15735,15 +15774,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr "Éditer un magasin de vélo"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "Transport public"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr "Référence UIC"
@@ -15751,5 +15790,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr "Halte ferroviaire"
@@ -15757,5 +15796,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr "Editez un arrêt"
@@ -15763,5 +15802,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr "Arrêt de tram"
@@ -15770,5 +15809,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr "Éditer un arrêt de tram"
@@ -15776,5 +15815,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr "Quai"
@@ -15783,5 +15822,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr "Éditer un quai"
@@ -15793,5 +15832,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr "Référence (numéro de voie)"
@@ -15799,10 +15838,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr "Surface"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr "Bouche de métro"
@@ -15811,10 +15850,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr "Éditer une bouche de métro"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr "Chaise roulante"
@@ -15823,5 +15862,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr "Gare routière"
@@ -15830,5 +15869,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr "Éditer une gare routière"
@@ -15836,5 +15875,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr "Arrêt de bus"
@@ -15844,5 +15883,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr "Éditer un arrêt de bus"
@@ -15853,6 +15892,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr "Abri"
@@ -15860,10 +15899,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr "Plateforme de bus"
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr "Éditer une plateforme de bus"
@@ -15871,5 +15910,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr "Taxi"
@@ -15877,5 +15916,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr "Editez une station de taxi"
@@ -15883,5 +15922,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr "Aéroport"
@@ -15889,15 +15928,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr "Modifier aéroport"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr "ICAO"
@@ -15906,5 +15945,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr "Hôtel"
@@ -15916,5 +15955,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hôtel"
@@ -15923,15 +15962,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr "Éditer un hôtel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr "Étoiles"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr "Môtel"
@@ -15939,20 +15978,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr "Éditer un motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr "Chambre d’hôte"
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr "Éditer une chambre d’hôte"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr "Châlet"
@@ -15960,10 +15999,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr "Editez un châlet"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr "Hôtel"
@@ -15971,30 +16010,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr "Éditer une auberge de jeunesse"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr "Chalet"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr "Modifier chalet"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr "Site pour caravane"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr "Éditer un  site pour caravane"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr "Camping"
@@ -16002,10 +16041,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr "Éditer un camping"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "Nourriture & boissons"
@@ -16016,5 +16055,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -16022,5 +16061,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr "Éditer un restaurant"
@@ -16028,5 +16067,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr "Cuisine"
@@ -16034,61 +16073,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr "italien"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr "chinois"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr "greque"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr "allemand"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr "indien"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr "régional"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr "turque"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr "asiatique"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr "thaïlandais"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr "mexicain"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr "japonais"
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -16096,9 +16135,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr "Éditer un fast food"
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr "Café"
@@ -16106,10 +16145,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr "Editez un café"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr "Bar"
@@ -16117,20 +16156,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr "Pub"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr "Éditer un biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr "Bar"
@@ -16138,10 +16177,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr "Modifier Bar"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr "Boîte de nuit"
@@ -16149,20 +16188,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr "Éditer une boîte de nuit"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "Tourisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr "Attraction"
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr "Editez une attraction"
@@ -16171,11 +16210,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr "Horaires d’ouverture"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "Musée"
@@ -16183,10 +16222,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr "Éditer un musée"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "Zoo"
@@ -16195,10 +16234,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr "Editez un Zoo"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr "Point de vue"
@@ -16206,25 +16245,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr "Éditer un point de vue"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr "Tour de surveillance"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr "Parc d’attraction"
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr "Éditer un parc d’attraction"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr "Oeuvre d’art"
@@ -16232,5 +16271,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr "Éditer une oeuvre d’art"
@@ -16238,5 +16277,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr "Office du Tourisme"
@@ -16244,80 +16283,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr "Modifier Office du Tourisme"
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "Carte"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr "Type de carte"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr "carte"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr "carte de la ville"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr "carte de randonnée"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr "carte de randonnée cycliste"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
 msgid "Closer Description"
 msgstr "Description détaillée"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1701
 msgid "Information Board"
 msgstr "Bureau d'informations"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Board Type"
 msgstr "Type de bureau"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "board"
 msgstr "tableau"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "history"
 msgstr "histoire"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "nature"
 msgstr "nature"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "wildlife"
 msgstr "faune"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Guidepost (Hiking)"
 msgstr "Panneau de direction (randonnée)"
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr "Autre points d'information"
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr "Éditer un abri"
@@ -16325,25 +16364,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr "Âtre"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr "Site de pique-nique"
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr "Éditer un site de pique-nique"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "Patrimoine"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "Château"
@@ -16352,20 +16391,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr "Éditer un château"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "Ruines"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr "Éditer des ruines"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr "Site archéologique"
@@ -16374,10 +16413,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr "Éditer un site archéologique"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr "Lieu de bataille"
@@ -16385,5 +16424,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr "Éditer un lieu de bataille"
@@ -16391,15 +16430,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr "Monument commémoratif"
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr "Editez un monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr "Mémorial"
@@ -16407,45 +16446,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr "Éditer un mémorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr "Croix"
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr "Éditer une croix"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr "Chapelle"
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr "Éditer une Chapelle"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "Loisir"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr "Parc aquatique"
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr "Éditer un parc aquatique"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "Aire de jeux"
@@ -16453,15 +16492,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr "Éditer une zone de jeu"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "Pêche"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr "Éditer un lieu de pêche"
@@ -16469,15 +16508,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr "Sport"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "Stade"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr "Éditer un stade"
@@ -16491,6 +16530,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "Selectionner un sport:"
@@ -16513,4 +16552,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -16571,5 +16618,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16579,5 +16634,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16723,5 +16778,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16827,5 +16882,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16866,29 +16921,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr "sport"
@@ -16898,227 +16954,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr "tir à l'arc"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr "athletics"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr "boules"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr "canoë"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr "climbing"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr "cricket_nets"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr "cycling"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr "dog_racing"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr "équitation"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr "football"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr "gymnastics"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr "horse_racing"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr "moteur"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr "pelote"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr "chasse"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr "skate"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr "ski"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "football"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr "swimming"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "table_tennis"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr "Centre sportif"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr "Éditer un centre sportif"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr "Terrain de sport"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr "Éditer un terrain de sport"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr "Circuit"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr "Éditer un circuit"
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr "Parcours de Golf"
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr "Éditer un terrain de golf"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr "Éditer un minigolf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr "Multi"
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr "Editer Multi"
@@ -17157,191 +17213,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr "Terrain"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr "sports_centre"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr "stadium"
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr "Éditer un Bowling"
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr "Athlétisme"
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr "Éditer athlétisme"
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr "Tir à l’arc"
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr "Éditer tir à l’arc"
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr "Escalade"
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr "Éditer escalade"
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr "Canoë"
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr "Éditer canoë"
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr "Cyclisme"
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr "Éditer cyclisme"
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr "Course de chiens"
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr "Éditer course de chiens"
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr "Equitation"
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr "Éditer sports équestres"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr "Course de chevaux"
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr "Éditer course de chevaux"
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr "Gymnastique"
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr "Éditer gymnastique"
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr "Sports mécaniques"
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr "Éditer sports mécaniques"
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr "Skate"
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr "Éditer patin à roulettes"
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr "Éditer skateboard"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr "Natation"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr "Éditer natation"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr "Ski"
@@ -17349,56 +17405,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr "ski"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr "Type de piste"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr "de descente"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr "nordique"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr "snow park"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr "Difficulté"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr "verte"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr "bleue"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr "intermédiaire"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr "avancé"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr "jaune"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr "Tirer"
@@ -17406,178 +17462,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr "Éditer tir sportif"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr "Sport de balle"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr "Football"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr "Éditer football"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr "Football"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr "Éditer football"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr "Football australien"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr "Éditer football australien"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr "Éditer baseball"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr "Éditer basketball"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr "Editer un Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr "Boules"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr "Éditer boules"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr "Boules"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr "Éditer bowls"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr "Éditer cricket"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr "Filets de cricket"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr "Éditer filets de cricket"
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr "Éditer croquet"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr "Éditer hockey"
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr "Pelote"
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr "Éditer pelote basque"
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr "Sports de raquette"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr "Éditer sports de raquette"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr "Éditer rugby"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr "Tennis de table"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr "Éditer tennis de table"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr "Éditer tennis"
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "Bâtiments"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr "Bâtiment"
@@ -17585,5 +17641,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "Bâtiment officiel"
@@ -17591,10 +17647,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr "Éditer un bâtiment officiel"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "Mairie"
@@ -17602,10 +17658,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "Éditer une mairie"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "Ambassade"
@@ -17613,10 +17669,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "Editer une ambassade"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "Palais de justice"
@@ -17625,10 +17681,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "Éditer un palais de justice"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "Prison"
@@ -17637,10 +17693,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "Éditer une prison"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "Poste de police"
@@ -17650,10 +17706,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "Éditer un poste de police"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "Caserne de pompiers"
@@ -17662,10 +17718,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "Éditer une caserne de pompiers"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "Bureau de poste"
@@ -17673,5 +17729,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr "Éditer un bureau de poste"
@@ -17679,15 +17735,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr "Jardin d’enfants"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr "Éditer un jardin d’enfants"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "École"
@@ -17695,10 +17751,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "Éditer une école"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr "Université"
@@ -17706,10 +17762,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr "Éditer une université"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr "Établissement d’enseignement supérieur"
@@ -17717,5 +17773,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr "Éditer un établissement d’enseignement supérieur"
@@ -17723,5 +17779,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "Cinema"
@@ -17730,10 +17786,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "Éditer un cinéma"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "Bibliothèque"
@@ -17742,10 +17798,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "Éditer une bibliothèque"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr "Centre artistique"
@@ -17753,10 +17809,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr "Éditer un centre artistique"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "Théâtre"
@@ -17765,10 +17821,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "Éditer un théatre"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr "Lieu de culte"
@@ -17778,5 +17834,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr "Éditer un lieu de culte"
@@ -17785,6 +17841,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr "Religion"
@@ -17793,66 +17849,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr "christian"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr "jewish"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr "unitarisme"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr "Dénomination"
@@ -17861,81 +17917,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr "anglican"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr "catholique"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr "evangelical"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr "jehovahs_witness"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr "Adresses"
@@ -17944,5 +18000,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr "Editez l'adresse"
@@ -17950,5 +18006,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr "Numéro du bâtiment"
@@ -17956,20 +18012,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr "Nom de la maison"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr "Nom de la ville"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "Code postal"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr "Indicatif du pays"
@@ -17977,5 +18033,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr "Interpolation d’adresse"
@@ -17984,5 +18040,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr "Éditer l’interpolation d’adresse"
@@ -17990,71 +18046,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr "Schéma de numérotation"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr "pair"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr "impair"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr "all"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr "alphabétique"
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr "Édifices"
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr "Usine"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr "Éditer une usine"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "Structure de hauteur"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "Éditer une structure de hauteur"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "Château d’eau"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "Éditer un château d’eau"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr "Gazomètre"
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr "Éditer un gazomètre"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "Phare"
@@ -18062,10 +18118,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "Éditer un phare"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "Moulin à vent"
@@ -18073,10 +18129,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "Éditer un moulin à vent"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -18084,10 +18140,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "Éditer un pipeline"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr "Station d’épuration"
@@ -18097,10 +18153,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr "Éditer une station d’épuration"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr "Grue"
@@ -18108,10 +18164,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr "Éditer une grue permanente"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr "Balise signalétique"
@@ -18119,10 +18175,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr "Editer balise signalétique"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr "Équipement de topographie"
@@ -18130,10 +18186,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr "Éditer un équipement de topographie"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -18141,5 +18197,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr "Éditer une caméra de surveillance"
@@ -18147,5 +18203,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr "Centrale électrique"
@@ -18155,39 +18211,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr "Éditer une centrale électrique"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr "hydro"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr "charbon"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr "photovoltaïque"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr "gaz"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr "Station électrique"
@@ -18196,10 +18252,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr "Editez une station électrique"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr "Transformateur électrique"
@@ -18208,5 +18264,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr "Modifier transformateur électrique"
@@ -18214,10 +18270,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr "Champ de vision"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr "Pylône électrique"
@@ -18228,5 +18284,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr "Éditer un pylône électrique"
@@ -18234,5 +18290,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr "Ligne de courant"
@@ -18241,25 +18297,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr "Editez une ligne de courant"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr "Tension"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr "Nombre de câbles"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr "Équipements"
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "Toilettes"
@@ -18267,20 +18323,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr "Numéro de référence"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr "Boîte aux lettres"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "Téléphone"
@@ -18289,5 +18345,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr "Éditer un téléphone"
@@ -18295,5 +18351,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "Pièces"
@@ -18301,5 +18357,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr "Billets"
@@ -18307,5 +18363,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr "Cartes de crédit temporaire"
@@ -18313,5 +18369,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr "Cartes de débit"
@@ -18319,15 +18375,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "Cartes de crédits"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "Cartes téléphoniques"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr "Recyclage"
@@ -18336,5 +18392,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr "Éditer un point de recylcage"
@@ -18342,35 +18398,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr "Canettes"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr "Vêtements"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr "Verre"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr "Ferrailleur"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr "Banc"
@@ -18379,20 +18435,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr "Hutte de chasse"
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr "Hutte de chasse"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr "Masquer"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr "Verrouiller"
@@ -18400,22 +18456,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr "Hauteur"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr "faible"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr "à moitié"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr "complet"
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr "Fontaine"
@@ -18424,10 +18480,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr "Éditer une fontaine"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "Eau potable"
@@ -18436,10 +18492,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "Éditer un point d’eau potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr "Tour d’abandon (nouveau né)"
@@ -18447,25 +18503,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr "Éditer un tour d’abandon"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "Magasins"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr "Supermarché"
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr "Éditer un supermarché"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr "Commerce de proximité"
@@ -18473,10 +18529,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr "Éditer une épicerie"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr "Kiosque à journaux"
@@ -18484,10 +18540,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr "Éditer un kiosque à journaux"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "Distributeur automatique"
@@ -18495,5 +18551,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "Éditer un distributeur automatique"
@@ -18501,88 +18557,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "Produits vendus"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr "public_transport_tickets"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr "public_transport_plans"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr "parking_tickets"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr "food"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "drinks"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr "bonbons"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr "cigarettes"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr "photos"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr "animal_food"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "news_papers"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "jouets"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr "stamps"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "SIM-cards"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr "telephone_vouchers"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr "vouchers"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr "condoms"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr "excrement_bags"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr "Cartes de fidélité"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "Boucherie"
@@ -18590,10 +18646,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "Éditer une boucherie"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "Boulanger"
@@ -18601,10 +18657,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "Éditer une boulangerie"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr "Fleuriste"
@@ -18612,20 +18668,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr "Modifier fleuriste"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr "Boutique bio"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr "Modifier boutique bio"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr "Alcool"
@@ -18633,60 +18689,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr "Modifier commerce d'acool"
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr "Boissons"
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr "Modifier débit de boissons"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr "Informatique"
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr "Modifier magasin informatique"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr "Électronique"
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr "Modifier magasin d’électronique"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr "Hi-Fi"
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr "Modifier boutique Hi-Fi"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr "Ameublement"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr "Modifier magasin d’ameublement"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr "Jardinerie"
@@ -18694,10 +18750,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr "Modifier jardinerie"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr "Quincaillerie"
@@ -18705,10 +18761,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr "Modifier quincaillerie"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr "Magasin de bricolage"
@@ -18716,60 +18772,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr "Éditer un magasin de bricolage"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr "Papeterie"
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr "Modifier papeterie"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr "Coiffeur"
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr "Editez un Coiffeur"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr "Magasin de chaussures"
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr "Modifier magasin de chaussures"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr "Jouets"
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr "Modifier magasin de jouets"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr "Vidéoclub"
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr "Modifier vidéoclub"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "Pressing"
@@ -18777,10 +18833,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "Éditer un pressing"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "Laverie libre-service"
@@ -18788,10 +18844,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "Éditer une laverie"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr "Magasin de sports d’extérieur"
@@ -18799,35 +18855,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr "Éditer un magasin de sports d’extérieur"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr "Sports"
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr "Modifier magasin de sport"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr "Opticien"
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr "Modifier opticien"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "Argent"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "Banque"
@@ -18835,5 +18891,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "Editez une banque"
@@ -18841,10 +18897,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "Distributeur automatique"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr "Bureau de change"
@@ -18852,5 +18908,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr "Éditer un bureau de change"
@@ -18858,15 +18914,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "Éditer un distributeur automatique"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "Santé"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr "Médecin"
@@ -18874,20 +18930,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr "Modifier Médecin"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr "Dentiste"
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr "Editez le Dentiste"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "Pharmacie"
@@ -18895,5 +18951,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "Éditer pharmacie"
@@ -18901,10 +18957,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr "Dispensaire"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "Hôpital"
@@ -18912,10 +18968,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "Éditer hôpital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr "Point d’accès d’urgence"
@@ -18924,5 +18980,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr "Éditer point d’accès d’urgence"
@@ -18931,20 +18987,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr "Numéro du point"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr "Nom du point"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr "Numéro de téléphone"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utiliser le code international, comme +12-345-67890"
@@ -18952,5 +19008,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr "Vétérinaire"
@@ -18959,56 +19015,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr "Editez un Vétérinaire"
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr "Continent"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr "Éditer un continent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr "Pays"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr "Éditer un pays"
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr "Département"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr "Éditer un état"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr "Région"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr "Éditer une région"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr "Comté/Canton"
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr "Éditer un comté/canton"
@@ -19016,15 +19071,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr "Ville de plus de 100 000 habitants"
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr "Editez la ville"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr "Ville 10 000 à 100 000 habitants"
@@ -19032,10 +19087,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr "Editez la ville"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr "Banlieue"
@@ -19043,25 +19098,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr "Éditer une banlieue"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "Village"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "Éditer un village"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr "Hameau"
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr "Éditer un hameau"
@@ -19069,5 +19124,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr "Lieu-dit"
@@ -19075,10 +19130,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr "Éditer un lieu-dit"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "île"
@@ -19086,5 +19141,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "Éditer une île"
@@ -19092,5 +19147,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr "Entrée de grotte"
@@ -19098,10 +19153,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr "Éditer une entrée de grotte"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "Sommet"
@@ -19109,10 +19164,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "Modifier un pic"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr "Glacier"
@@ -19120,10 +19175,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr "Éditer un glacier"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr "Volcan"
@@ -19131,70 +19186,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr "Éditer un volcan"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr "Frontières"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr "Nationale"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr "Éditer une frontière nationale"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr "Administrative"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr "Éditer une frontière administrative"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr "Civile"
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr "Éditer une frontière civile"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr "Politique"
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr "Éditer une zone électorale"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr "Parc national"
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr "Éditer les frontières d’un parc national"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr "Utilisation du terrain"
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "Arbre"
@@ -19203,15 +19258,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "Éditer un arbre isolé"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr "Nom botanique"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr "Bois"
@@ -19220,5 +19275,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr "Éditer un bois"
@@ -19226,17 +19281,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr "coniferous"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr "deciduous"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr "mixed"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "Forêt"
@@ -19245,14 +19300,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr "Éditer une forêt"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr "Réserve naturelle"
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr "Éditer une réserve naturelle"
@@ -19260,25 +19315,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr "Zone d’éboulements"
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr "Éditer une zone d’éboulements"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr "Broussailles"
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr "Éditer des broussailles"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr "Talus"
@@ -19286,10 +19341,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr "Éditer un talus"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr "Lande"
@@ -19297,5 +19352,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr "Éditer une lande"
@@ -19303,5 +19358,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr "Bâtiments de ferme"
@@ -19310,45 +19365,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr "Éditer des bâtiments de ferme"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr "Terrains de ferme"
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr "Éditer des terrains de ferme"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr "Prairie"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr "Editer prairie"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr "Vigne"
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr "Éditer une vigne"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr "Jardins familiaux"
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr "Éditer des jardins familiaux"
@@ -19356,25 +19411,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr "Jardin"
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr "Éditer un jardin"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr "Herbe"
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr "Éditer de l’herbe"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr "Zone publique herborée"
@@ -19382,10 +19437,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr "Éditer une zone publique herborée"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr "Espace commun"
@@ -19393,20 +19448,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr "Éditer un espace commun"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr "Parc"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr "Editez un Parc"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr "Aire de jeux"
@@ -19414,5 +19469,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr "Éditer une aire de jeux"
@@ -19420,15 +19475,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr "Zone résidentielle"
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr "Éditer une zone résidentielle"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr "Petit cimetière"
@@ -19436,9 +19491,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr "Éditer un petit cimetière"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr "Cimetière"
@@ -19446,39 +19501,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr "Éditer un cimetière"
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr "Zone commerciale"
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr "Éditer une zone commerciale"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr "Bureaux"
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr "Éditer des bureaux"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr "Zone industrielle"
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr "Éditer une zone industrielle"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr "Zone ferroviaire"
@@ -19486,15 +19541,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr "Éditer une zone ferroviaire"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr "Militaire"
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr "Éditer un terrain militaire"
@@ -19502,55 +19557,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr "Zone de construction"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr "Éditer un chantier"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr "Terrain en friche"
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr "Éditer un terrain en friche"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr "Espace vert"
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr "Éditer une nouvelle zone de construction"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr "Décharge"
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr "Éditer une décharge"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr "Carrière"
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr "Éditer une carrière"
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr "Multypoligone"
@@ -19560,5 +19615,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr "Modifier un multipolygone"
@@ -19567,10 +19622,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr "segment extérieur"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr "segment intérieur"
@@ -19578,5 +19633,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr "Interdiction de tourner"
@@ -19585,5 +19640,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr "Modifier une interdiction de tourner"
@@ -19591,34 +19646,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr "Interdiction de tourner à gauche"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr "Interdiction de tourner à droite"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr "Interdiction d'aller tout droit"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr "Interdiction de faire demi-tour"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr "Obligation de tourner à droite"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr "Obligation de tourner à gauche"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr "Obligation d'aller tout droit"
@@ -19627,15 +19682,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr "chemin d'origine"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr "nœud ou chemin de passage"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr "chemin destination"
@@ -19643,5 +19698,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr "Route"
@@ -19650,5 +19705,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr "Modifier une route"
@@ -19656,5 +19711,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr "Type de route"
@@ -19726,24 +19781,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr "vélo/bicyclette"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr "route"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr "ski"
@@ -19796,20 +19851,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr "piéton"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr "randonnée"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr "détour"
@@ -19823,10 +19878,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr "métro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr "Description du symbole"
@@ -19834,26 +19889,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr "Réseau"
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "Type de route"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr "proposé"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr "alternatif"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr "temporaire"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr "connexion"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr "Couleur (hexa)"
@@ -19862,30 +19923,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr "segment de route"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr "segment suivant"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr "segment précédent"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr "point d'arrêt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr "point d'arrêt suivant"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr "point d'arrêt précédent"
@@ -19921,6 +19982,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19936,5 +19998,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19953,5 +20023,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr "standard"
@@ -20045,7 +20115,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr "pont"
@@ -20310,15 +20380,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr "déprécié"
@@ -20360,5 +20430,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr "cheval"
@@ -20496,4 +20566,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20505,5 +20581,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20511,5 +20587,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20546,5 +20622,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20568,11 +20644,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr "barrière"
@@ -20596,5 +20672,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20635,5 +20711,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20671,6 +20747,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr "rue"
@@ -20726,7 +20802,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr "piste"
@@ -20779,11 +20855,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr "voie ferrée"
@@ -20804,5 +20888,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr "services"
@@ -20816,5 +20900,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr "Ford"
@@ -20835,5 +20919,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr "zone de manœuvre"
@@ -20847,6 +20931,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr "Accès d'urgence"
@@ -20861,5 +20945,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr "berge"
@@ -20873,5 +20957,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr "ruisseau"
@@ -20885,5 +20969,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr "dock"
@@ -20911,5 +20995,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr "aqueduc"
@@ -21052,5 +21136,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -21077,13 +21161,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr "artificiel"
@@ -21145,7 +21229,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr "point ferroviaire"
@@ -21168,10 +21252,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr "Autre voie ferrée"
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr "passage au dessus d'une voie ferrée"
@@ -21207,7 +21291,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr "ligne ferroviaire touristique"
@@ -21252,6 +21336,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr "piste d'atterrissage"
@@ -21265,5 +21349,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr "terminal"
@@ -21285,5 +21369,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr "piste (sombre)"
@@ -21297,5 +21381,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr "piste (claire)"
@@ -21303,4 +21387,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21343,7 +21434,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr "couloir aérien"
@@ -21360,5 +21451,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr "piste bleue"
@@ -21373,5 +21464,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr "piste rouge"
@@ -21386,5 +21477,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr "piste noire"
@@ -21399,5 +21490,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr "piste_orange"
@@ -21412,5 +21503,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr "hors piste"
@@ -21425,5 +21516,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr "piste verte"
@@ -21446,4 +21537,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -21454,4 +21552,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -21528,10 +21634,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr "alimentation électrique"
@@ -21545,5 +21652,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr "appontement/jetée"
@@ -21557,5 +21664,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr "oléoduc"
@@ -21683,12 +21790,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr "loisir"
@@ -21702,5 +21809,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr "marina"
@@ -21772,8 +21879,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr "aménité"
@@ -21875,10 +21982,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr "équipement de traffic"
@@ -21898,4 +22005,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21917,4 +22031,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -22238,4 +22359,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -22262,24 +22391,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr "équipement lumineux"
@@ -22311,6 +22448,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr "eau (claire)"
@@ -22371,8 +22508,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr "santé"
@@ -22725,26 +22862,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr "magasin"
@@ -22799,5 +22936,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22816,8 +22953,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr "hôtel"
@@ -22967,9 +23104,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr "tourisme"
@@ -23041,8 +23178,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr "patrimoine"
@@ -23113,8 +23250,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr "espace vert"
@@ -23128,5 +23265,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr "carrière"
@@ -23140,5 +23277,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr "décharge"
@@ -23160,5 +23297,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr "bassin"
@@ -23172,5 +23309,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr "forêt"
@@ -23184,5 +23321,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr "bâtiments de ferme"
@@ -23205,5 +23342,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr "commerce de proximité"
@@ -23217,5 +23354,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr "zone industrielle"
@@ -23229,5 +23366,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr "terrain en friche"
@@ -23241,5 +23378,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr "espace vert"
@@ -23253,5 +23390,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr "zone ferroviaire"
@@ -23308,7 +23445,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr "zone militaire"
@@ -23322,5 +23459,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr "cimetière"
@@ -23333,5 +23470,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr "sommet"
@@ -23346,5 +23483,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr "glacier"
@@ -23358,5 +23495,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr "volcan"
@@ -23411,8 +23548,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr "nature"
@@ -23426,5 +23563,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr "broussailles"
@@ -23438,5 +23575,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr "lande/bruyère"
@@ -23450,5 +23587,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr "bois"
@@ -23462,5 +23599,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr "terrain boueux/vase"
@@ -23474,5 +23611,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr "plage"
@@ -23550,8 +23687,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr "route"
@@ -23599,7 +23736,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr "frontière"
@@ -23741,10 +23878,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr "lieu"
@@ -23792,6 +23929,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr "adresse"
@@ -24088,24 +24225,15 @@
 msgstr "Terraserver Urbain"
 
+#~ msgid "Move"
+#~ msgstr "Déplacer"
+
+#~ msgid "Data Layer"
+#~ msgstr "Calque de données"
+
+#~ msgid "Not implemented yet."
+#~ msgstr "Pas encore implémenté."
+
 #~ msgid "Unknown file extension."
 #~ msgstr "Extension de fichier inconnue."
-
-#~ msgid "Move"
-#~ msgstr "Déplacer"
-
-#~ msgid "Invalid projection"
-#~ msgstr "Projection invalide"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Changez auparavant la projection en {0}"
-
-#~ msgid "end"
-#~ msgstr "fin"
-
-#~ msgid "Data Layer"
-#~ msgstr "Calque de données"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Pas encore implémenté."
 
 #~ msgid "Email"
@@ -24188,4 +24316,7 @@
 #~ msgstr ""
 #~ "Valider soit la sélection actuelle, soit toutes les données téléchargées."
+
+#~ msgid "end"
+#~ msgstr "fin"
 
 #~ msgid "Metacarta Map Rectifier image id"
@@ -24463,4 +24594,10 @@
 #~ msgstr "Déplacer vers le haut"
 
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Changez auparavant la projection en {0}"
+
+#~ msgid "Invalid projection"
+#~ msgstr "Projection invalide"
+
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
Index: /applications/editors/josm/i18n/po/gl.po
===================================================================
--- /applications/editors/josm/i18n/po/gl.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/gl.po	(revision 17069)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
 "PO-Revision-Date: 2009-06-27 15:34+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-10 11:57+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -56,6 +56,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -100,6 +100,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "Erro"
@@ -110,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "Cambios non gardados"
@@ -128,10 +128,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -148,15 +148,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -186,6 +186,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -215,5 +215,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -369,5 +369,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
 msgstr ""
@@ -451,9 +451,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -486,7 +486,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -567,37 +567,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "datos"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "conflito"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "descargar"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Facer zoom a {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Facer zoom na vista a {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -607,30 +607,30 @@
 msgstr "Vista: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "Non se seleccionou nada sobre o que facer zoom."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "Non hai conflitos sobre os que facer zoom"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "Combinar vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "Combinar varias vías en unha."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "Por favor, selecciona polo menos dúas vías para combinar."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -638,13 +638,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "Combinar de todas formas"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "Cambiar direccións?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -654,10 +654,10 @@
 "invertir algunhas?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "Invertir e Combinar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -665,20 +665,20 @@
 msgstr "Introducir valores para todos os conflitos."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Resolver Conflitos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combinar {0} vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "Todas as vías están vacías"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -725,6 +725,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -746,6 +746,6 @@
 msgstr "Borrar obxectos seleccionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -755,5 +755,5 @@
 msgstr "Sobrescribir"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -886,7 +886,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "Exportar os datos a un ficheiro GPX."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -902,5 +901,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -918,5 +917,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -990,22 +989,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "Acoplar Nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "Acoplar nodos no máis antigo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "Por favor, selecciona polo menos dous nodos a acoplar."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1013,9 +1012,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "Acoplar de todas formas"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -1023,5 +1022,5 @@
 "uso."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1278,7 +1277,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "Non hai documentos abertos, polo que non hai nada que gardar."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1893,5 +1891,5 @@
 msgstr "Erros durante a descarga"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1903,5 +1901,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr "Primitivas borradas ou movidas"
@@ -1940,11 +1938,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2085,5 +2083,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2160,5 +2158,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Buscar obxectos."
@@ -2288,5 +2286,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Buscar"
@@ -2492,5 +2490,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2533,5 +2531,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr "Borrar da relación"
@@ -2573,9 +2571,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "Acoplar {0} nodos"
-msgstr[1] "Acoplar {0} nodos"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2613,9 +2611,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "{0} nodo"
-msgstr[1] "{0} nodos"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2781,7 +2779,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "Cambiar {0} obxecto"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2791,5 +2789,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2836,5 +2834,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2867,5 +2865,5 @@
 msgstr "o parámetro \"{0}\" non é unha clase aceptable, obtivose \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2879,5 +2877,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "Vía férrea"
@@ -2892,5 +2890,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3172,5 +3170,5 @@
 msgstr "Non amosar de novo"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3181,5 +3179,5 @@
 "Comproba o URL do servidor nas preferencias e a túa conexión a internet."
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3192,10 +3190,10 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr "Violación de condición previa"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3203,25 +3201,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "descoñecido"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3231,9 +3229,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3242,9 +3240,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "Excepción Inesperada"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3254,9 +3264,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "Maquina descoñecida"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3269,5 +3279,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr "A primitiva xa foi borrada"
@@ -3357,10 +3367,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "Nome de usuario"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "Contrasinal"
@@ -3564,15 +3574,15 @@
 msgstr "(sen obxecto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "a capa non está na lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3629,5 +3639,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr ""
@@ -3636,5 +3646,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr ""
@@ -3643,20 +3653,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3666,6 +3676,6 @@
 msgstr "Etiquetas"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3673,6 +3683,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3680,40 +3690,40 @@
 msgstr "Membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3721,74 +3731,74 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3796,30 +3806,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3827,5 +3837,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3833,13 +3843,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3847,5 +3857,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3853,21 +3863,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3876,27 +3886,27 @@
 msgstr "Eliminar"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3904,5 +3914,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3911,5 +3921,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3918,5 +3928,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3925,5 +3935,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -3932,21 +3942,21 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -3956,5 +3966,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -3964,5 +3974,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -3970,19 +3980,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -3991,19 +4001,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr "Si, desfacer o borrado de eles tamén"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr "Non, cancelar a operación"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -4014,9 +4024,9 @@
 "servidor.<br><br>Quere desfacer o borrado de eses nodos tamén?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr "Desfacer o borrado de nodos adicionais?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -4026,13 +4036,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr "Desfacer o borrado de primitivas dependentes?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -4040,90 +4050,90 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "borrado"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4133,17 +4143,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4152,14 +4162,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4167,21 +4177,21 @@
 msgstr "Papel"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4189,14 +4199,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4204,7 +4214,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4216,7 +4226,7 @@
 msgstr "Tecla"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4229,45 +4239,45 @@
 msgstr "Valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr ""
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4287,8 +4297,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4327,5 +4337,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4428,83 +4438,83 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "Capas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "Abrir unha lista de todas as capas cargadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "Borrar a capa seleccionada."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr "Borrar Capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "Amosar/Ocultar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "Cambiar o estado visible da capa seleccionada."
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "Mover a capa seleccionada unha fila cara arriba."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "Mover a capa seleccionada unha fila cara abaixo."
@@ -4514,6 +4524,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4522,22 +4532,22 @@
 msgstr[1] "Esto cambiará ata {0} obxectos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "Un valor vacío borra a clave."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<diferente>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "Cambiar valores?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4545,5 +4555,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4552,41 +4562,41 @@
 msgstr[1] "Cambiar as propiedades de ata {0} obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "Por favor, selecciona unha tecla"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "Por favor selecciona un valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 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/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "Propiedades dos obxectos seleccionados."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "Membro de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "Engadir Propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4603,39 +4613,39 @@
 msgstr "Engadir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 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/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "Editar Propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 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/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "Cambiar relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, 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/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "Borrar a clave seleccionada en todos os obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "Borrar Propiedades"
@@ -4647,5 +4657,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "Relacións"
@@ -4677,31 +4687,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "Selección Actual"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "Abrir unha ventá de lista de selección."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "Facer zoom sobre o(s) elemento(s) seleccionado(s)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "Actualizar a lista de seleccion."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "Facer zoom sobre a selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Sel.: Rel.:{0} / Vías:{1} / Nodos:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4709,5 +4719,5 @@
 msgstr "Selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4716,5 +4726,5 @@
 msgstr[1] "{0} vías"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4723,5 +4733,5 @@
 msgstr[1] "{0} relacións"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -4934,7 +4944,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "Borrar a relación seleccionada"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -5017,5 +5026,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5259,5 +5268,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "Lugares"
@@ -5304,21 +5313,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "tipo"
@@ -6118,72 +6127,513 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "Nome"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr "Imaxes para {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr "Ler GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Non hai hora para o punto {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, 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}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr "Non se atoparon imaxes con marcas de tempo lexibles."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "Lendo {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr "Imaxes xeo-etiquetadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr "Inicio GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr "Fin GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr "delta actual: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr "Diferencia de zona horaria: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "imaxe"
+msgstr[1] "imaxes"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} dentro da traza."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "Sincronizar reloxo"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "imaxes JPEG (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "A data no ficheiro \"{0}\" non puido ser analizada."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Non hai hora EXIF no ficheiro \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "Imaxe"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Introduce a data amosada (mm/dd/yyy HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr "Zona horaria da unidade GPS (differencia coa foto)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr "Sincronizar hora coa da unidade GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr "A hora introducida non puido ser analizada."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr "punto gps"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "Personalizar debuxo de liñas"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr "Usar configuración global."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr "Debuxar liñas entre puntos para esta capa."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr "Non debuxar liñas entre puntos para esta capa."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr "Seleccionar as opcións de liña do debuxo"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "Personalizar Cor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Predeterminado"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Escolle unha cor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "Importar Audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr "Ficheiros Wave Audio (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Marcas de audio de {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "Importar imaxes"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} trazado, "
+msgstr[1] "{0} trazados, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} ruta, "
+msgstr[1] "{0} rutas, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} punto de vía"
+msgstr[1] "{0} puntos de vía"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr "Nome: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr "Descrición: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr "Rango de tempo: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr "Lonxitude: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "Convertir en capa de datos"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+msgid ""
+"<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 "
+"perxudicial.<br>Se desexas subir trazados, mira aqui:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Convertido de: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr "Descargar todo o que abarca:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr "{0} metros"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr "Área máxima por petición:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km cad."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Esta acción require {0} peticións de<br>descarga individuais. "
+"Desexas<br>continuar?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr "Non hai trazados GPX dispoñibles na capa para asociar ó audio."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Algúns puntos de vía que estaban demasiado lonxe da traza para estimar "
+"correctamente os seus tempos foron omitidos."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Capa de datos {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr "fora da área descargada"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} composto de:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} borrados.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr "Convertir a capa GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6192,7 +6642,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6202,446 +6652,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "Nome"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr "Imaxes para {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr "Ler GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Non hai hora para o punto {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, 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}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr "Non se atoparon imaxes con marcas de tempo lexibles."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Lendo {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr "Imaxes xeo-etiquetadas"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr "Inicio GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr "Fin GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr "delta actual: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr "Diferencia de zona horaria: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "imaxe"
-msgstr[1] "imaxes"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} dentro da traza."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "Sincronizar reloxo"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "imaxes JPEG (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "A data no ficheiro \"{0}\" non puido ser analizada."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Non hai hora EXIF no ficheiro \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "Imaxe"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Introduce a data amosada (mm/dd/yyy HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr "Zona horaria da unidade GPS (differencia coa foto)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr "Sincronizar hora coa da unidade GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr "A hora introducida non puido ser analizada."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr "punto gps"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "Personalizar debuxo de liñas"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "Usar configuración global."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr "Debuxar liñas entre puntos para esta capa."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr "Non debuxar liñas entre puntos para esta capa."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr "Seleccionar as opcións de liña do debuxo"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "Personalizar Cor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Predeterminado"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Escolle unha cor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "Importar Audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr "Ficheiros Wave Audio (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Marcas de audio de {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "Importar imaxes"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} trazado, "
-msgstr[1] "{0} trazados, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} ruta, "
-msgstr[1] "{0} rutas, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} punto de vía"
-msgstr[1] "{0} puntos de vía"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr "Nome: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr "Descrición: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr "Rango de tempo: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr "Lonxitude: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "Convertir en capa de datos"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-msgid ""
-"<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 "
-"perxudicial.<br>Se desexas subir trazados, mira aqui:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Convertido de: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr "Descargar todo o que abarca:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr "{0} metros"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr "Área máxima por petición:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km cad."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Esta acción require {0} peticións de<br>descarga individuais. "
-"Desexas<br>continuar?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr "Non hai trazados GPX dispoñibles na capa para asociar ó audio."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Algúns puntos de vía que estaban demasiado lonxe da traza para estimar "
-"correctamente os seus tempos foron omitidos."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Capa de datos {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr "fora da área descargada"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} composto de:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} borrados.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr "Convertir a capa GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -7031,5 +7040,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "Coche"
@@ -7046,16 +7055,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "Bicicleta"
@@ -7083,14 +7094,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "Pé"
@@ -7315,19 +7329,19 @@
 msgstr "Idioma"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr "Activar os valores predeterminados incorporadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr ""
@@ -7458,37 +7472,11 @@
 msgstr "Contrasinal do servidor proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr "A URL base do servidor OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Contrasinal de inicio de sesión da conta OSM. Deixar en branco para non "
-"almacenar ningunha contrasinal."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "URL Base do Servidor"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "Contrasinal OSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -7862,7 +7850,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "Non se puido ler \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -7967,7 +7955,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "Papel \"{0}\" descoñecido."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8127,23 +8115,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "Contrasinal ou nome de usuario incorrectos."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Advertencia: O contrasinal transfírese sen encriptar."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "Gardar usuario e contrasinal (sen encriptar)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "Introduce Contrasinal"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
 msgstr "Inicio de sesión"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr ""
+"Contrasinal de inicio de sesión da conta OSM. Deixar en branco para non "
+"almacenar ningunha contrasinal."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "Contrasinal OSM"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -8306,14 +8320,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "Tipo de membro descoñecido para \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "Preparar os datos de OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr "ID de nodo mal formada"
@@ -8760,5 +8774,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr ""
@@ -9163,5 +9177,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr "Erro cargando ficheiro"
@@ -9488,5 +9502,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -10024,7 +10038,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr ""
@@ -10197,7 +10211,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "nome"
+msgstr ""
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10747,12 +10760,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "{0} metros"
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0} nodo"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -10890,5 +10903,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr ""
@@ -11700,7 +11713,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr ""
@@ -11714,5 +11727,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr ""
@@ -11945,12 +11958,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "Por favor selecciona a fila a editar."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "Borrar Capa"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
@@ -11963,7 +11974,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "Non hai cambios que subir."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -11974,61 +11984,61 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr "Gardar capa WMS nun ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr "Cargar capa WMS dende ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Versión de ficheiro WMS non soportado; atopouse {0}, esperabase {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr "Erro de Formato de Ficheiro"
@@ -12356,4 +12366,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12390,5 +12402,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr ""
@@ -12399,5 +12411,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr ""
@@ -12406,5 +12418,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr ""
@@ -12431,8 +12443,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr ""
@@ -12473,21 +12485,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr ""
@@ -12501,8 +12513,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr ""
@@ -12520,15 +12532,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -12565,16 +12577,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr ""
@@ -12616,19 +12628,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr ""
@@ -12664,19 +12676,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr ""
@@ -12710,18 +12722,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr ""
@@ -12755,18 +12767,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr ""
@@ -12774,5 +12786,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr ""
@@ -12781,5 +12793,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr ""
@@ -12787,5 +12799,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr ""
@@ -12794,5 +12806,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr ""
@@ -12802,6 +12814,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr ""
@@ -12809,5 +12821,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr ""
@@ -12816,5 +12828,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr ""
@@ -12827,5 +12839,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr ""
@@ -12834,5 +12846,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr ""
@@ -12840,10 +12852,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr ""
@@ -12855,5 +12867,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr ""
@@ -12863,5 +12875,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr ""
@@ -12869,5 +12881,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr ""
@@ -12877,5 +12889,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr ""
@@ -12887,5 +12899,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr ""
@@ -12895,5 +12907,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr ""
@@ -12920,19 +12932,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr ""
@@ -12944,5 +12956,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr ""
@@ -12951,5 +12963,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr ""
@@ -12973,13 +12985,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr ""
@@ -12999,20 +13011,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr ""
@@ -13020,12 +13032,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr ""
@@ -13033,5 +13045,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr ""
@@ -13040,5 +13052,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr ""
@@ -13046,5 +13058,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr ""
@@ -13053,5 +13065,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr ""
@@ -13061,18 +13073,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr ""
@@ -13080,5 +13092,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr ""
@@ -13088,5 +13100,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -13094,5 +13106,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -13101,5 +13113,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -13108,20 +13120,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr ""
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -13134,8 +13146,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr ""
@@ -13179,23 +13191,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr ""
@@ -13208,40 +13220,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr ""
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr ""
@@ -13254,19 +13266,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr ""
@@ -13289,65 +13301,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr ""
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr ""
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -13362,10 +13374,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr ""
@@ -13381,13 +13393,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr ""
@@ -13403,30 +13415,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr ""
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr ""
@@ -13434,25 +13446,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr ""
@@ -13463,5 +13475,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr ""
@@ -13483,9 +13495,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr ""
@@ -13505,10 +13517,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr ""
@@ -13530,10 +13542,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr ""
@@ -13555,10 +13567,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr ""
@@ -13580,6 +13592,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr ""
@@ -13593,9 +13605,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr ""
@@ -13609,9 +13621,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr ""
@@ -13641,10 +13653,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr ""
@@ -13652,4 +13664,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13667,6 +13686,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr ""
@@ -13677,10 +13696,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr ""
@@ -13688,19 +13707,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr ""
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr ""
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr ""
@@ -13716,5 +13735,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr ""
@@ -13723,5 +13742,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr ""
@@ -13729,5 +13748,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr ""
@@ -13735,5 +13754,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr ""
@@ -13743,5 +13762,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr ""
@@ -13749,5 +13768,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr ""
@@ -13756,5 +13775,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr ""
@@ -13762,5 +13781,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr ""
@@ -13769,5 +13788,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr ""
@@ -13775,5 +13794,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr ""
@@ -13783,5 +13802,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr ""
@@ -13790,5 +13809,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr ""
@@ -13797,14 +13816,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr ""
@@ -13812,18 +13831,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr ""
@@ -13831,5 +13850,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr ""
@@ -13838,5 +13857,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr ""
@@ -13844,5 +13863,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr ""
@@ -13851,5 +13870,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr ""
@@ -13857,5 +13876,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr ""
@@ -13864,5 +13883,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr ""
@@ -13870,5 +13889,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr ""
@@ -13877,5 +13896,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr ""
@@ -13883,5 +13902,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr ""
@@ -13890,5 +13909,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -13897,5 +13916,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr ""
@@ -13904,13 +13923,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr ""
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr ""
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr ""
@@ -13918,5 +13937,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr ""
@@ -13926,5 +13945,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr ""
@@ -13932,5 +13951,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr ""
@@ -13940,5 +13959,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr ""
@@ -13946,5 +13965,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr ""
@@ -13954,5 +13973,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr ""
@@ -13960,5 +13979,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr ""
@@ -13968,5 +13987,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr ""
@@ -13974,5 +13993,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr ""
@@ -13982,5 +14001,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr ""
@@ -13988,5 +14007,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr ""
@@ -13996,5 +14015,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr ""
@@ -14002,10 +14021,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr ""
@@ -14013,15 +14032,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr ""
@@ -14029,5 +14048,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr ""
@@ -14062,14 +14081,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr ""
@@ -14078,5 +14097,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr ""
@@ -14086,5 +14105,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -14093,27 +14112,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr ""
@@ -14121,6 +14140,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr ""
@@ -14129,11 +14148,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -14141,30 +14160,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr ""
@@ -14172,5 +14191,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -14179,14 +14198,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr ""
@@ -14197,14 +14216,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr ""
@@ -14214,20 +14233,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr ""
@@ -14235,5 +14254,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr ""
@@ -14241,5 +14260,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr ""
@@ -14247,5 +14266,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr ""
@@ -14254,10 +14273,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr ""
@@ -14265,5 +14284,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr ""
@@ -14271,5 +14290,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -14281,7 +14300,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr ""
@@ -14289,5 +14308,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr ""
@@ -14295,5 +14314,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr ""
@@ -14301,5 +14320,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr ""
@@ -14338,18 +14357,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr ""
@@ -14358,5 +14381,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr ""
@@ -14364,5 +14387,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr ""
@@ -14370,10 +14393,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr ""
@@ -14381,15 +14404,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr ""
@@ -14397,5 +14420,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr ""
@@ -14403,10 +14426,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr ""
@@ -14416,5 +14439,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr ""
@@ -14423,5 +14446,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr ""
@@ -14430,5 +14453,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr ""
@@ -14436,5 +14459,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr ""
@@ -14443,5 +14466,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr ""
@@ -14453,15 +14476,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr ""
@@ -14469,50 +14492,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr ""
@@ -14520,15 +14543,26 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+msgid "Turnstile"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "Editar Propiedades"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr ""
@@ -14539,10 +14573,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr ""
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr ""
@@ -14550,5 +14584,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr ""
@@ -14556,5 +14590,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr ""
@@ -14562,10 +14596,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr ""
@@ -14573,10 +14607,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr ""
@@ -14584,10 +14618,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr ""
@@ -14597,5 +14631,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr ""
@@ -14603,15 +14637,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr ""
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr ""
@@ -14619,15 +14653,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr ""
@@ -14635,15 +14669,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -14651,5 +14685,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr ""
@@ -14658,10 +14692,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr ""
@@ -14672,14 +14706,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr ""
@@ -14693,35 +14727,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr ""
@@ -14729,20 +14763,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr ""
@@ -14750,10 +14784,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr ""
@@ -14761,5 +14795,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr ""
@@ -14767,5 +14801,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr ""
@@ -14773,5 +14807,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr ""
@@ -14780,5 +14814,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr ""
@@ -14786,10 +14820,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr ""
@@ -14797,5 +14831,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr ""
@@ -14803,5 +14837,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr ""
@@ -14809,15 +14843,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr ""
@@ -14826,5 +14860,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr ""
@@ -14832,20 +14866,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr ""
@@ -14854,15 +14888,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr ""
@@ -14870,10 +14904,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr ""
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr ""
@@ -14881,10 +14915,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr ""
@@ -14894,5 +14928,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr ""
@@ -14900,10 +14934,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr ""
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr ""
@@ -14911,5 +14945,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr ""
@@ -14939,8 +14973,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr ""
@@ -14954,35 +14988,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr ""
@@ -14990,45 +15024,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr ""
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr ""
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr ""
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr ""
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr ""
@@ -15036,5 +15070,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -15043,14 +15077,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr ""
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr ""
@@ -15059,5 +15093,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr ""
@@ -15066,5 +15100,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr ""
@@ -15074,5 +15108,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr ""
@@ -15080,5 +15114,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr ""
@@ -15087,10 +15121,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr ""
@@ -15098,10 +15132,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr ""
@@ -15109,10 +15143,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr ""
@@ -15120,10 +15154,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr ""
@@ -15131,5 +15165,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr ""
@@ -15137,5 +15171,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr ""
@@ -15146,10 +15180,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr ""
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr ""
@@ -15159,5 +15193,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr ""
@@ -15173,5 +15207,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15181,5 +15215,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr ""
@@ -15187,41 +15221,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr ""
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr ""
@@ -15229,5 +15263,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr ""
@@ -15235,15 +15269,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr ""
@@ -15251,5 +15285,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr ""
@@ -15258,10 +15292,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr ""
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr ""
@@ -15269,5 +15303,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr ""
@@ -15275,5 +15309,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr ""
@@ -15282,5 +15316,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr ""
@@ -15289,15 +15323,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr ""
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr ""
@@ -15305,5 +15339,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr ""
@@ -15311,5 +15345,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr ""
@@ -15317,5 +15351,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr ""
@@ -15324,5 +15358,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr ""
@@ -15330,5 +15364,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr ""
@@ -15337,5 +15371,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr ""
@@ -15347,5 +15381,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr ""
@@ -15353,10 +15387,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr ""
@@ -15365,10 +15399,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr ""
@@ -15377,5 +15411,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr ""
@@ -15384,5 +15418,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr ""
@@ -15390,5 +15424,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr ""
@@ -15398,5 +15432,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr ""
@@ -15407,6 +15441,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr ""
@@ -15414,10 +15448,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr ""
@@ -15425,5 +15459,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr ""
@@ -15431,5 +15465,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr ""
@@ -15437,5 +15471,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr ""
@@ -15443,15 +15477,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr ""
@@ -15460,5 +15494,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr ""
@@ -15470,5 +15504,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -15477,15 +15511,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr ""
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr ""
@@ -15493,20 +15527,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr ""
@@ -15514,10 +15548,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr ""
@@ -15525,30 +15559,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr ""
@@ -15556,10 +15590,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr ""
@@ -15570,5 +15604,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr ""
@@ -15576,5 +15610,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr ""
@@ -15582,5 +15616,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr ""
@@ -15588,61 +15622,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr ""
@@ -15650,9 +15684,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr ""
@@ -15660,10 +15694,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr ""
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr ""
@@ -15671,20 +15705,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr ""
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr ""
@@ -15692,10 +15726,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr ""
@@ -15703,20 +15737,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr ""
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr ""
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr ""
@@ -15725,11 +15759,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr ""
@@ -15737,10 +15771,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr ""
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr ""
@@ -15749,10 +15783,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr ""
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr ""
@@ -15760,25 +15794,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr ""
@@ -15786,5 +15820,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr ""
@@ -15792,5 +15826,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr ""
@@ -15798,80 +15832,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr ""
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr ""
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr ""
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr ""
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr ""
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
+msgid "Closer Description"
+msgstr ""
+
+#. item "Tourism/Map" text "Closer Description"
+#: build/trans_presets.java:1701
+msgid "Information Board"
+msgstr ""
+
+#. item "Tourism/Information Board" text "Name"
+#: build/trans_presets.java:1705
+msgid "Board Type"
+msgstr ""
+
+#. item "Tourism/Information Board" combo "Board Type"
+#: build/trans_presets.java:1705
+msgid "board"
+msgstr ""
+
+#: build/trans_presets.java:1705
+msgid "history"
+msgstr ""
+
+#: build/trans_presets.java:1705
+msgid "nature"
+msgstr ""
+
+#: build/trans_presets.java:1705
+msgid "wildlife"
+msgstr ""
+
+#. item "Tourism/Information Board" text "Closer Description"
 #: build/trans_presets.java:1708
-msgid "Closer Description"
-msgstr ""
-
-#. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
-msgid "Information Board"
-msgstr ""
-
-#. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
-msgid "Board Type"
-msgstr ""
-
-#. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
-msgid "board"
-msgstr ""
-
-#: build/trans_presets.java:1694
-msgid "history"
-msgstr ""
-
-#: build/trans_presets.java:1694
-msgid "nature"
-msgstr ""
-
-#: build/trans_presets.java:1694
-msgid "wildlife"
-msgstr ""
-
-#. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
 msgid "Guidepost (Hiking)"
 msgstr ""
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr ""
@@ -15879,25 +15913,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr ""
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr ""
@@ -15906,20 +15940,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr ""
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr ""
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr ""
@@ -15928,10 +15962,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr ""
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr ""
@@ -15939,5 +15973,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr ""
@@ -15945,15 +15979,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr ""
@@ -15961,45 +15995,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr ""
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr ""
@@ -16007,15 +16041,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr ""
@@ -16023,15 +16057,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr ""
@@ -16045,6 +16079,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr ""
@@ -16067,4 +16101,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -16125,5 +16167,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16133,5 +16183,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16277,5 +16327,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16381,5 +16431,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16420,29 +16470,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr ""
@@ -16452,227 +16503,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr ""
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr ""
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr ""
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr ""
@@ -16711,191 +16762,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr ""
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr ""
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr ""
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr ""
@@ -16903,56 +16954,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr ""
@@ -16960,178 +17011,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr ""
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr ""
@@ -17139,5 +17190,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr ""
@@ -17145,10 +17196,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr ""
@@ -17156,10 +17207,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr ""
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr ""
@@ -17167,10 +17218,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr ""
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr ""
@@ -17179,10 +17230,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr ""
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr ""
@@ -17191,10 +17242,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr ""
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr ""
@@ -17204,10 +17255,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr ""
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr ""
@@ -17216,10 +17267,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr ""
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr ""
@@ -17227,5 +17278,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr ""
@@ -17233,15 +17284,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr ""
@@ -17249,10 +17300,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr ""
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr ""
@@ -17260,10 +17311,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr ""
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr ""
@@ -17271,5 +17322,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr ""
@@ -17277,5 +17328,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr ""
@@ -17284,10 +17335,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr ""
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr ""
@@ -17296,10 +17347,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr ""
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr ""
@@ -17307,10 +17358,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr ""
@@ -17319,10 +17370,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr ""
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr ""
@@ -17332,5 +17383,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr ""
@@ -17339,6 +17390,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr ""
@@ -17347,66 +17398,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr ""
@@ -17415,81 +17466,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr ""
@@ -17498,5 +17549,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr ""
@@ -17504,5 +17555,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr ""
@@ -17510,20 +17561,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr ""
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr ""
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr ""
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr ""
@@ -17531,5 +17582,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr ""
@@ -17538,5 +17589,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -17544,71 +17595,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr ""
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr ""
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr ""
@@ -17616,10 +17667,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr ""
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr ""
@@ -17627,10 +17678,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr ""
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr ""
@@ -17638,10 +17689,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr ""
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr ""
@@ -17651,10 +17702,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr ""
@@ -17662,10 +17713,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr ""
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr ""
@@ -17673,10 +17724,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr ""
@@ -17684,10 +17735,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr ""
@@ -17695,5 +17746,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr ""
@@ -17701,5 +17752,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr ""
@@ -17709,39 +17760,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr ""
@@ -17750,10 +17801,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr ""
@@ -17762,5 +17813,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -17768,10 +17819,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr ""
@@ -17782,5 +17833,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr ""
@@ -17788,5 +17839,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr ""
@@ -17795,25 +17846,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr ""
@@ -17821,20 +17872,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr ""
@@ -17843,5 +17894,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr ""
@@ -17849,5 +17900,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr ""
@@ -17855,5 +17906,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr ""
@@ -17861,5 +17912,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -17867,5 +17918,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr ""
@@ -17873,15 +17924,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr ""
@@ -17890,5 +17941,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr ""
@@ -17896,35 +17947,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr ""
@@ -17933,20 +17984,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr ""
@@ -17954,22 +18005,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr ""
@@ -17978,10 +18029,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr ""
@@ -17990,10 +18041,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr ""
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr ""
@@ -18001,25 +18052,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr ""
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr ""
@@ -18027,10 +18078,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr ""
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr ""
@@ -18038,10 +18089,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr ""
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr ""
@@ -18049,5 +18100,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr ""
@@ -18055,88 +18106,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr ""
@@ -18144,10 +18195,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr ""
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr ""
@@ -18155,10 +18206,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr ""
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr ""
@@ -18166,20 +18217,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr ""
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr ""
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr ""
@@ -18187,60 +18238,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr ""
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr ""
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr ""
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr ""
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr ""
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr ""
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr ""
@@ -18248,10 +18299,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr ""
@@ -18259,10 +18310,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -18270,60 +18321,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr ""
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr ""
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr ""
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr ""
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr ""
@@ -18331,10 +18382,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr ""
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr ""
@@ -18342,10 +18393,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr ""
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr ""
@@ -18353,35 +18404,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr ""
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr ""
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr ""
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr ""
@@ -18389,5 +18440,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr ""
@@ -18395,10 +18446,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr ""
@@ -18406,5 +18457,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr ""
@@ -18412,15 +18463,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr ""
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr ""
@@ -18428,20 +18479,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr ""
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr ""
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr ""
@@ -18449,5 +18500,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr ""
@@ -18455,10 +18506,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr ""
@@ -18466,10 +18517,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr ""
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr ""
@@ -18478,5 +18529,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -18485,20 +18536,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -18506,5 +18557,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr ""
@@ -18513,56 +18564,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr ""
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr ""
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr ""
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr ""
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr ""
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr ""
@@ -18570,15 +18620,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr ""
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr ""
@@ -18586,10 +18636,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr ""
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr ""
@@ -18597,25 +18647,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr ""
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr ""
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr ""
@@ -18623,5 +18673,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr ""
@@ -18629,10 +18679,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr ""
@@ -18640,5 +18690,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr ""
@@ -18646,5 +18696,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr ""
@@ -18652,10 +18702,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr ""
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr ""
@@ -18663,10 +18713,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr ""
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr ""
@@ -18674,10 +18724,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr ""
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr ""
@@ -18685,70 +18735,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr ""
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr ""
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr ""
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr ""
@@ -18757,15 +18807,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr ""
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr ""
@@ -18774,5 +18824,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr ""
@@ -18780,17 +18830,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr ""
@@ -18799,14 +18849,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -18814,25 +18864,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr ""
@@ -18840,10 +18890,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr ""
@@ -18851,5 +18901,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr ""
@@ -18857,5 +18907,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr ""
@@ -18864,45 +18914,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -18910,25 +18960,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr ""
@@ -18936,10 +18986,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr ""
@@ -18947,20 +18997,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr ""
@@ -18968,5 +19018,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -18974,15 +19024,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr ""
@@ -18990,9 +19040,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr ""
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr ""
@@ -19000,39 +19050,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr ""
@@ -19040,15 +19090,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr ""
@@ -19056,55 +19106,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr ""
@@ -19114,5 +19164,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr ""
@@ -19121,10 +19171,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr ""
@@ -19132,5 +19182,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr ""
@@ -19139,5 +19189,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -19145,34 +19195,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr ""
@@ -19181,15 +19231,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr ""
@@ -19197,5 +19247,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr ""
@@ -19204,5 +19254,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr ""
@@ -19210,5 +19260,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr ""
@@ -19280,24 +19330,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr ""
@@ -19350,20 +19400,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr ""
@@ -19377,10 +19427,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr ""
@@ -19388,26 +19438,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr ""
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "Xirar"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr ""
@@ -19416,30 +19472,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr ""
@@ -19475,6 +19531,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19490,5 +19547,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19507,5 +19572,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr ""
@@ -19599,7 +19664,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr ""
@@ -19864,15 +19929,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr ""
@@ -19914,5 +19979,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr ""
@@ -20050,4 +20115,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20059,5 +20130,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20065,5 +20136,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20100,5 +20171,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20122,11 +20193,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr ""
@@ -20150,5 +20221,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20189,5 +20260,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20225,6 +20296,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr ""
@@ -20280,7 +20351,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr ""
@@ -20333,11 +20404,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr ""
@@ -20358,5 +20437,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr ""
@@ -20370,5 +20449,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr ""
@@ -20389,5 +20468,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr ""
@@ -20401,6 +20480,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr ""
@@ -20415,5 +20494,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr ""
@@ -20427,5 +20506,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr ""
@@ -20439,5 +20518,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr ""
@@ -20465,5 +20544,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr ""
@@ -20606,5 +20685,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20631,13 +20710,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr ""
@@ -20699,7 +20778,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr ""
@@ -20722,10 +20801,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr ""
@@ -20761,7 +20840,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr ""
@@ -20806,6 +20885,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr ""
@@ -20819,5 +20898,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr ""
@@ -20839,5 +20918,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr ""
@@ -20851,5 +20930,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr ""
@@ -20857,4 +20936,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20897,7 +20983,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr ""
@@ -20914,5 +21000,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr ""
@@ -20927,5 +21013,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr ""
@@ -20940,5 +21026,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr ""
@@ -20953,5 +21039,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr ""
@@ -20966,5 +21052,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr ""
@@ -20979,5 +21065,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr ""
@@ -21000,4 +21086,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -21008,4 +21101,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -21082,10 +21183,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr ""
@@ -21099,5 +21201,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr ""
@@ -21111,5 +21213,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr ""
@@ -21237,12 +21339,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr ""
@@ -21256,5 +21358,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr ""
@@ -21326,8 +21428,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr ""
@@ -21429,10 +21531,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr ""
@@ -21452,4 +21554,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21471,4 +21580,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21792,4 +21908,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -21816,24 +21940,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr ""
@@ -21865,6 +21997,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr ""
@@ -21925,8 +22057,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr ""
@@ -22279,26 +22411,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr ""
@@ -22353,5 +22485,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22370,8 +22502,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr ""
@@ -22521,9 +22653,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr ""
@@ -22595,8 +22727,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr ""
@@ -22667,8 +22799,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr ""
@@ -22682,5 +22814,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr ""
@@ -22694,5 +22826,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr ""
@@ -22714,5 +22846,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr ""
@@ -22726,5 +22858,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr ""
@@ -22738,5 +22870,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr ""
@@ -22759,5 +22891,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr ""
@@ -22771,5 +22903,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr ""
@@ -22783,5 +22915,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr ""
@@ -22795,5 +22927,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr ""
@@ -22807,5 +22939,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr ""
@@ -22862,7 +22994,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr ""
@@ -22876,5 +23008,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr ""
@@ -22887,5 +23019,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr ""
@@ -22900,5 +23032,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr ""
@@ -22912,5 +23044,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr ""
@@ -22965,8 +23097,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr ""
@@ -22980,5 +23112,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr ""
@@ -22992,5 +23124,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr ""
@@ -23004,5 +23136,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr ""
@@ -23016,5 +23148,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr ""
@@ -23028,5 +23160,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr ""
@@ -23104,8 +23236,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr ""
@@ -23153,7 +23285,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr ""
@@ -23295,10 +23427,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr ""
@@ -23346,6 +23478,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr ""
@@ -23642,10 +23774,4 @@
 msgstr ""
 
-#~ msgid "Unknown file extension."
-#~ msgstr "Extensión de ficheiro descoñecida."
-
-#~ msgid "Move"
-#~ msgstr "Mover"
-
 #~ msgid ""
 #~ "Server returned internal error. Try a reduced area or retry after waiting "
@@ -23805,4 +23931,7 @@
 #~ "{0}"
 
+#~ msgid "Unknown file extension."
+#~ msgstr "Extensión de ficheiro descoñecida."
+
 #~ msgid ""
 #~ "The sources (URL or filename) of tagging preset definition files. See "
@@ -23868,6 +23997,6 @@
 #~ msgstr "Cambiar"
 
-#~ msgid "Rotate"
-#~ msgstr "Xirar"
+#~ msgid "Move"
+#~ msgstr "Mover"
 
 #~ msgid "position"
Index: /applications/editors/josm/i18n/po/he.po
===================================================================
--- /applications/editors/josm/i18n/po/he.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/he.po	(revision 17069)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
 "PO-Revision-Date: 2009-08-04 10:56+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-10 11:57+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -56,6 +56,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -100,6 +100,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "שגיאה"
@@ -110,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "שינויים לא שמורים"
@@ -128,10 +128,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -148,15 +148,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -186,6 +186,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -215,5 +215,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -369,5 +369,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
 msgstr ""
@@ -451,9 +451,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -486,7 +486,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -569,37 +569,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "נתונים"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "שכבה"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "בחירה"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "התנגשות"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "הורד"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "התקרב אל {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "קרב את התצוגה לכדי {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -609,30 +609,30 @@
 msgstr "תצוגה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "לא נבחר פריט להתקרבות."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "אין התנגשויות להתמקד בהם"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "שלב דרכים"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "שלב מספר דרכים לאחת."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "נא בחר לפחות שתי דרכים לשילוב."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr "לשלב שתי דרכים בעלות חברויות שונות?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -640,13 +640,13 @@
 msgstr "לדרכים הנבחרות ישנם יחסים משתנים. האם אתה עדיין מעוניין לשלב ביניהם?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "אחד בכל זאת"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "לשנות כיוונים?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -654,10 +654,10 @@
 msgstr "לא ניתן לשלב את הדרכים בכיווניהם הנוכחיים. האם ברצונך להפוך כמה מהם?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "הפוך כיוון ואחד"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -665,20 +665,20 @@
 msgstr "הזן ערכים לכל ההתנגשויות."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "פתור התנגשויות"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "שלב {0} דרכים"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "כל הדרכים היו ריקות"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -723,6 +723,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -744,6 +744,6 @@
 msgstr "מחק את הפריטים הנבחרים."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -753,5 +753,5 @@
 msgstr "שכתוב"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -883,7 +883,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "ייצא נתונים לקובץ GPX."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -899,5 +898,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -915,5 +914,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -985,22 +984,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "מיזוג צמתים"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "מזג את הצמתים לישנים ביותר."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "אנא בחר לפחות שני צמתים למיזוג."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr "למזג צמתים בעלי חברויות שונות?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1009,13 +1008,13 @@
 "לצמתים האפשריים ישנן קשרי חברות שונים. האם אתה עדיין מעוניין למזג אותם?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "מזג בכל זאת"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "לא ניתן למזג צמתים: יש למחוק דרך שעדיין בשימוש."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1269,7 +1268,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "אין כל מסמך פתוח ולכן אין מה לשמור."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1850,5 +1848,5 @@
 msgstr "שגיאות במהלך הורדה"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1860,5 +1858,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr ""
@@ -1897,11 +1895,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2041,5 +2039,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2111,5 +2109,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "חיפוש אחר פריטים."
@@ -2235,5 +2233,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "חפש"
@@ -2434,5 +2432,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2473,5 +2471,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr "מחק מיחס"
@@ -2510,9 +2508,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "מזג {0} צמתים"
-msgstr[1] "מזג {0} צמתים"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2548,9 +2546,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "נקודה {0}"
-msgstr[1] "{0} נקודות"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2712,7 +2710,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "שנה עצם {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2722,5 +2720,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2767,5 +2765,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2798,5 +2796,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2810,5 +2808,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "מסילת רכבת"
@@ -2823,5 +2821,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3100,5 +3098,5 @@
 msgstr "אל תציג שוב"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3107,5 +3105,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3115,10 +3113,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr "הפרת תנאי מקדים"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3126,25 +3124,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "לא ידוע"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3154,9 +3152,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3165,9 +3163,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "שגיאה בלתי צפויה"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3177,9 +3187,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "מארח לא ידוע"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3189,5 +3199,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr ""
@@ -3277,10 +3287,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "שם משתמש"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "סיסמא"
@@ -3482,15 +3492,15 @@
 msgstr "(אין עצם)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "השכבה אינה ברשימה."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3544,5 +3554,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr "שלי עם שלהם"
@@ -3551,5 +3561,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr "שלי עם המיזוג"
@@ -3558,20 +3568,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr "שלהם עם המיזוג"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr "תכונות"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3581,6 +3591,6 @@
 msgstr "תוויות"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3588,6 +3598,6 @@
 msgstr "נקודות"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3595,40 +3605,40 @@
 msgstr "חברים"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr "נקודות (פתורות)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "נקודות (עם התנגשויות)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "חברים (פתורים)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3636,74 +3646,74 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "חברים (עם התנגשויות)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "תכונות (עם התנגשויות)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "פתרון התנגשות"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr "הפריט {0} לא נמצא ברשימה"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr "נעל גלילה"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr "השווה "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr "הגירסה שלי"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr "גירסה ממוזגת"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3711,30 +3721,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr "הגירסה שלהם"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr "> ראש"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr "העתק את הנקודות הנבחרות שלי לראשית רשימת הנקודות הממוזגת"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr "> תחתית"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr "העתק את האלמנטים הנבחרים שלי לסוף רשימת האלמנטים הממוזגים"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3744,5 +3754,5 @@
 "הממוזגים"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3752,13 +3762,13 @@
 "הממוזגים"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr "העתק את האלמנט הנבחר שלהם לתחילת רשימת האלמנטים הממוזגים"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr "העתק את האלמנטים הנבחרים שלהם לסוף רשימת האלמנטים הממוזגים"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3768,5 +3778,5 @@
 "הממוזגים"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3776,21 +3786,21 @@
 "הממוזגים"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr "מעלה"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr "העלה את האלמנט הנבחר מקום אחד"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr "מטה"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr "העלה את האלמנטים הנבחרים מקום אחד"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3799,27 +3809,27 @@
 msgstr "הסר"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr "הקפה"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr "הקפה את הרשימה הנוכחית של אלמנטים ממוזגים"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr "הפשר"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3827,5 +3837,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3834,5 +3844,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3841,5 +3851,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3848,5 +3858,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -3855,21 +3865,21 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -3879,5 +3889,5 @@
 msgstr "הפרמטר '{0}' לא יכול ליהיות ריק (null)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -3887,5 +3897,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -3893,19 +3903,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr "נקודה"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr "אינדקס טור לא צפוי. התקבל {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -3914,19 +3924,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr "כן, בטל גם את המחיקה שלהם"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr "לא, בטל את הפעולה"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -3935,9 +3945,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr "בטל מחיקת נקודות נוספות?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -3947,13 +3957,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -3961,90 +3971,90 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr "קואורדינטות:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr "(לא כלום)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "מחוק"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr "לא נמחק"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr "שמור את הקואורדינטות שלי"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr "שמור את הקואורדינטות שלהם"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4054,17 +4064,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4073,14 +4083,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4088,21 +4098,21 @@
 msgstr "תפקיד"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4110,14 +4120,14 @@
 msgstr "<לא מוגדר>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4125,7 +4135,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4137,7 +4147,7 @@
 msgstr "מפתח"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4150,45 +4160,45 @@
 msgstr "ערך"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr ""
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr "הפרמטר 'col' חייב ליהיות 0 או 1. התקבל {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr "הגרסה שלהם (הנתונים על השרת)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr "<"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4208,8 +4218,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4246,5 +4256,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4346,83 +4356,83 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "שכבות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "פתח רשימה המכילה את כל השכבות שנטענו."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "מחק את השכבה הנבחרת."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr "מחק שכבה"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "הצג/הסתר"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "מחליף את המצב החזותי של השכבה הנבחרת."
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "העבר את השכבה הנבחרת שורה אחת מעלה."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "העבר את השכבה הנוכחית שורה אחת מטה."
@@ -4432,6 +4442,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4440,22 +4450,22 @@
 msgstr[1] "זה ישנה עד {0} עצמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "ערך ריק מוחק את המפתח."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<שונה>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "לשנות ערכים?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4463,5 +4473,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4470,40 +4480,40 @@
 msgstr[1] "שנה תכונות של עד {0} עצמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "נא בחר מפתח"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "נא בחר ערך"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 msgid "Please select the objects you want to change properties for."
 msgstr "בחר את העצמים שאתה רוצה לשנות את תכונותיהם."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "תכונות\\חברויות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "תכונות לעצמים שנבחרו."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "חבר ב"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "הוסף תכונות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4520,39 +4530,39 @@
 msgstr "הוסף"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 msgid "Add a new key/value pair to all objects"
 msgstr "הוסף מצד מפתח/ערך לכל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "ערוך מאפיינים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 msgid "Edit the value of the selected key for all objects"
 msgstr "ערוך את הערך של המפתח הנבחר עבור כל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "תכונות: {0} \\ חברויות: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "תכונות \\ חברויות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "שנה יחס"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "באמת מחק את הבחירה מהיחס {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "מחק את המפתח הנבחר בכל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "מחק מאפיינים"
@@ -4564,5 +4574,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "יחסים"
@@ -4594,31 +4604,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "הבחירה הנוכחית"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "פתח חלון רשימת בחירה."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "התאם מיקוד לאלמנט\\ים הבחור\\ים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "רענן את רשימת הבחירה."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "התאם מיקוד לבחירה"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "בחר: יחסים:{0} \\ דרכים: {1} \\ נקודות: {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4626,5 +4636,5 @@
 msgstr "בחירה"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4633,5 +4643,5 @@
 msgstr[1] "{0} דרכים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4640,5 +4650,5 @@
 msgstr[1] "יחסים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -4848,7 +4858,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "מחק את היחס הנבחר"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -4931,5 +4940,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5169,5 +5178,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "מקומות"
@@ -5214,21 +5223,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "סוג"
@@ -6028,72 +6037,513 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "שם"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr "תמונות עבור {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr "קורא GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "אין זמן לנקודה {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "לא ניתן לקרוא מהזמן \"{0}\" מהנקודה {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr "לא נמצאו תמונות עם חותמות זמין קריאות."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "קורא {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr "תמונות בעלות גאותגיות"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr "התחלת GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr "סיום GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr "הפרש נוכחי: {0}ש'"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr "הפרש אזורי הזמן: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "תמונה"
+msgstr[1] "תמונות"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} מתוך הרצועה."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "סנכרן שעון"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "תמונות JPEG (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "לא ניתן לנתח את התאריך שבקובץ \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "אין נתוני שעה במבנה EXIF בתוך הקובץ \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "תמונה"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "הזן את התאריך המוצג (mm/dd/yyyy HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr "אזור זמן של יחידת GPS (הבדל מתמונה)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr "סנכרן את השעה עם יחידת ה-GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr "לא ניתן לנתח את הזמן שהוזן."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr "נקודת gps"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "התאם ציור קו"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr "השתמש בהגדרות הגלובליות."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr "צייר קווים בין נקודות בשכבה זו."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr "אל תצייר קווים בין נקודות בשכבה זו."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr "בחר אפשרויות ציור קו"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "התאם צבעים"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "ברירת מחדל"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "בחר צבע"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr "סמנים מנקודות בעלות שם"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "ייבא שמע"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr "קובץ שמע (wav.*)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "סמן שמע מ {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "ייבא תמונות"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "נקודת דרך {0}"
+msgstr[1] "{0} נקודות דרך"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr "שם: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr "תיאור: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr "אורך: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "המר לשכבת נתונים"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+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>אם אתה רוצה להעלות "
+"מסלולים, ראה כאן:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr "המר מ: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr "הורד הכל עם:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr "{0} מטרים"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr "שטח מירבי לבקשה"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} קמ\"ר"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>הפעולה הזו דורשת {0} בקשות<br>הורדה נפרדות. האם אתה רוצה<br>להמשיך?</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"כמה נקודות דרך שהיו רחוקות מידי מהמסלול מכדי שיהיה אפשר להעריך את הזמן שלהם "
+"באופן הגיוני הושמטו."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr "שכבת נתונים {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr "מחוץ לשטח שהורד"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr "גירסה {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} מורכב מ-:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} נמחק/ו.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr "גירסת API: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr "המר לשכבת GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6102,7 +6552,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6112,446 +6562,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "שם"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr "תמונות עבור {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr "קורא GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "אין זמן לנקודה {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "לא ניתן לקרוא מהזמן \"{0}\" מהנקודה {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr "לא נמצאו תמונות עם חותמות זמין קריאות."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "קורא {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr "תמונות בעלות גאותגיות"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr "התחלת GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr "סיום GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr "הפרש נוכחי: {0}ש'"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr "הפרש אזורי הזמן: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "תמונה"
-msgstr[1] "תמונות"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} מתוך הרצועה."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "סנכרן שעון"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "תמונות JPEG (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "לא ניתן לנתח את התאריך שבקובץ \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "אין נתוני שעה במבנה EXIF בתוך הקובץ \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "תמונה"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "הזן את התאריך המוצג (mm/dd/yyyy HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr "אזור זמן של יחידת GPS (הבדל מתמונה)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr "סנכרן את השעה עם יחידת ה-GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr "לא ניתן לנתח את הזמן שהוזן."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr "נקודת gps"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "התאם ציור קו"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "השתמש בהגדרות הגלובליות."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr "צייר קווים בין נקודות בשכבה זו."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr "אל תצייר קווים בין נקודות בשכבה זו."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr "בחר אפשרויות ציור קו"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "התאם צבעים"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "ברירת מחדל"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "בחר צבע"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr "סמנים מנקודות בעלות שם"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "ייבא שמע"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr "קובץ שמע (wav.*)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "סמן שמע מ {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "ייבא תמונות"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "נקודת דרך {0}"
-msgstr[1] "{0} נקודות דרך"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr "שם: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr "תיאור: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr "אורך: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "המר לשכבת נתונים"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-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>אם אתה רוצה להעלות "
-"מסלולים, ראה כאן:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr "המר מ: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr "הורד הכל עם:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr "{0} מטרים"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr "שטח מירבי לבקשה"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} קמ\"ר"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>הפעולה הזו דורשת {0} בקשות<br>הורדה נפרדות. האם אתה רוצה<br>להמשיך?</"
-"html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"כמה נקודות דרך שהיו רחוקות מידי מהמסלול מכדי שיהיה אפשר להעריך את הזמן שלהם "
-"באופן הגיוני הושמטו."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr "שכבת נתונים {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr "מחוץ לשטח שהורד"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr "גירסה {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} מורכב מ-:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} נמחק/ו.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr "גירסת API: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr "המר לשכבת GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -6921,5 +6930,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "רכב"
@@ -6936,16 +6945,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "אופניים"
@@ -6973,14 +6984,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "רגל"
@@ -7187,19 +7201,19 @@
 msgstr "שפה"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr "אפשר ברירות מחדל מובנות"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr ""
@@ -7328,35 +7342,11 @@
 msgstr "סיסמת שרת פרוקסי"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr "סיסמת כניסה לחשבון OSM. השאר ריק כדי לא לשמור אף סיסמא."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "כתובת שרת הבסיס"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "סיסמת OSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -7705,7 +7695,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "לא ניתן לקרוא את \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -7808,7 +7798,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "סוג לא ידוע: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -7966,23 +7956,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "סיסמא או שם משתמש שגויים."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "אזהרה: הסיסמא נשלחת בצורה לא מוצפנת."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "שמור את המשתמש והסיסמא (לא מוצפנים)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "הכנס סיסמא"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
 msgstr "התחברות"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr "סיסמת כניסה לחשבון OSM. השאר ריק כדי לא לשמור אף סיסמא."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "סיסמת OSM"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -8145,14 +8159,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "סוג לא ידוע: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "מכין נתוני OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr ""
@@ -8598,5 +8612,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr "תיאור"
@@ -9005,5 +9019,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr "שגיאה בטעינת קובץ"
@@ -9328,5 +9342,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -9862,7 +9876,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr "מים"
@@ -10038,7 +10052,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "שם"
+msgstr ""
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10591,12 +10604,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "התחלה"
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "נקודה {0}"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -10734,5 +10747,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr "שם רחוב"
@@ -11545,7 +11558,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr "בניין"
@@ -11559,5 +11572,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr "שטח"
@@ -11790,12 +11803,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "נא בחר את השורה לעריכה."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "מחק שכבה"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
@@ -11808,7 +11819,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "אין שינויים להעלאה."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -11819,61 +11829,61 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr "הורדה אוטומטית"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr "הורד משטחים גלויים"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr "שנה רזולוציה"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr "טען מחדש משטחים פגומים"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr "שמור שכבת WMS לקובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr "טען שכבת WMS מקובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "גירסת קובץ WMS לא נתמכת; נמצא {0}, צפי {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr "שגיאה בפורמט קובץ"
@@ -12203,4 +12213,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12237,5 +12249,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr "רחובות"
@@ -12246,5 +12258,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "כבישים"
@@ -12253,5 +12265,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr ""
@@ -12278,8 +12290,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr "התייחסות"
@@ -12320,21 +12332,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr "שכבה"
@@ -12348,8 +12360,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr "מסלולים"
@@ -12367,15 +12379,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr "מהירות מירבית (קמ\"ש)"
@@ -12412,16 +12424,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr "חד סטרי"
@@ -12463,19 +12475,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "גשר"
@@ -12511,19 +12523,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr "מנהרה"
@@ -12557,18 +12569,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr ""
@@ -12602,18 +12614,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr ""
@@ -12621,5 +12633,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr ""
@@ -12628,5 +12640,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr ""
@@ -12634,5 +12646,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr ""
@@ -12641,5 +12653,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr ""
@@ -12649,6 +12661,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr ""
@@ -12656,5 +12668,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr ""
@@ -12663,5 +12675,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr ""
@@ -12674,5 +12686,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "ראשי"
@@ -12681,5 +12693,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr ""
@@ -12687,10 +12699,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr ""
@@ -12702,5 +12714,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "משני"
@@ -12710,5 +12722,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr ""
@@ -12716,5 +12728,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr ""
@@ -12724,5 +12736,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr ""
@@ -12734,5 +12746,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "לא מסווג"
@@ -12742,5 +12754,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr "ערוך כביש לא מסווג"
@@ -12767,19 +12779,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr ""
@@ -12791,5 +12803,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "מגורים"
@@ -12798,5 +12810,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr "ערוך רחוב מגורים"
@@ -12820,13 +12832,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr "שטח פנים"
@@ -12846,20 +12858,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr "סלול"
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr "לא סלול"
@@ -12867,12 +12879,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr "אבני ריצוף"
@@ -12880,5 +12892,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr ""
@@ -12887,5 +12899,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr ""
@@ -12893,5 +12905,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr "שירות"
@@ -12900,5 +12912,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr "ערוך דרך שירות"
@@ -12908,18 +12920,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr ""
@@ -12927,5 +12939,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr "מפרץ חנייה"
@@ -12935,5 +12947,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr "ערוך מפרץ חנייה"
@@ -12941,5 +12953,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr "כביש (סוג לא ידוע)"
@@ -12948,5 +12960,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr "ערוך כביש מסוג לא ידוע"
@@ -12955,20 +12967,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr "הגבלות דרך"
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr "ערוך הגבלות דרך"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr "אגרה"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr "דרך ללא מוצא"
@@ -12981,8 +12993,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr "גישה"
@@ -13026,23 +13038,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr "כן"
@@ -13055,40 +13067,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr "פרטי"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr ""
@@ -13101,19 +13113,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr "יעד"
@@ -13136,65 +13148,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr "חקלאי"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr "לא"
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -13209,10 +13221,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr "סוס"
@@ -13228,13 +13240,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr "אופנוע"
@@ -13250,30 +13262,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr "רכב ציבורי"
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr "סירת מנוע"
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr "סירה"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr "מהירות מינימלית (קמ\"ש)"
@@ -13281,25 +13293,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr "משקל מירבי (טונות)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr "כיכר"
@@ -13310,5 +13322,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr "ערוך צומת"
@@ -13330,9 +13342,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr "סוג"
@@ -13352,10 +13364,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr ""
@@ -13377,10 +13389,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr ""
@@ -13402,10 +13414,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr "ראשי"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr ""
@@ -13427,6 +13439,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr "משני"
@@ -13440,9 +13452,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr "שלישוני"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr ""
@@ -13456,9 +13468,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr "מגורים"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr ""
@@ -13488,10 +13500,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr "שירות"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr ""
@@ -13499,4 +13511,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13514,6 +13533,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr "בנייה"
@@ -13524,10 +13543,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr "ערוך גשר"
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr ""
@@ -13535,19 +13554,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr "דרכים"
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr "בנייה"
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr "ערוך דרך מהירה בבנייה"
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr "צומת"
@@ -13563,5 +13582,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr "כיכר"
@@ -13570,5 +13589,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr ""
@@ -13576,5 +13595,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr ""
@@ -13582,5 +13601,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr "שביל אופניים"
@@ -13590,5 +13609,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr "ערוך שביל אופניים"
@@ -13596,5 +13615,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr "שביל להולכי רגל"
@@ -13603,5 +13622,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr "ערוך שביל להולכי רגל"
@@ -13609,5 +13628,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr "הולכי רגל"
@@ -13616,5 +13635,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr "ערוך רחוב להולכי רגל"
@@ -13622,5 +13641,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr "מדרגות"
@@ -13630,5 +13649,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr "ערוך גרם מדרגות"
@@ -13637,5 +13656,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr ""
@@ -13644,14 +13663,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr "חצץ"
@@ -13659,18 +13678,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr "אדמה"
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr "דשא"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr "חול"
@@ -13678,5 +13697,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr ""
@@ -13685,5 +13704,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr ""
@@ -13691,5 +13710,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr ""
@@ -13698,5 +13717,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr ""
@@ -13704,5 +13723,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr ""
@@ -13711,5 +13730,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr ""
@@ -13717,5 +13736,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr ""
@@ -13724,5 +13743,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr ""
@@ -13730,5 +13749,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr ""
@@ -13737,5 +13756,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -13744,5 +13763,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr "נתיב"
@@ -13751,13 +13770,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr "ערוך נתיב"
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr "רכב שלג"
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr "סקי"
@@ -13765,5 +13784,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr "צעידה"
@@ -13773,5 +13792,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr "ערוך צעידה"
@@ -13779,5 +13798,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr "צעידה הררית"
@@ -13787,5 +13806,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr "ערוך צעידה הררית"
@@ -13793,5 +13812,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr "צעידה הררית מאומצת"
@@ -13801,5 +13820,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr "ערוך צעידה הררית מאומצת"
@@ -13807,5 +13826,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr "צעידה אלפינית"
@@ -13815,5 +13834,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr "ערוך צעידה אלפינית"
@@ -13821,5 +13840,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr "צעידה אלפינית מאומצת"
@@ -13829,5 +13848,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr "ערוך צעידה אלפינית מאומצת"
@@ -13835,5 +13854,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr "צעידה אלפינית קשה"
@@ -13843,5 +13862,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr "ערוך צעידה אלפינית קשה"
@@ -13849,10 +13868,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr "ציון דרך"
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr ""
@@ -13860,15 +13879,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr "מספר"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr "שירותים"
@@ -13876,5 +13895,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr "ערוך תחנת שירות"
@@ -13909,14 +13928,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr "מפעיל"
@@ -13925,5 +13944,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr "רמזור"
@@ -13933,5 +13952,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr "סוג מעבר חציה"
@@ -13940,27 +13959,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr "אי"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr ""
@@ -13968,6 +13987,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr ""
@@ -13976,11 +13995,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -13988,30 +14007,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr "זברה"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr "שקנאי"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr "עצור"
@@ -14019,5 +14038,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr "מעבר חציה"
@@ -14026,14 +14045,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr ""
@@ -14044,14 +14063,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr ""
@@ -14061,20 +14080,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr "תחום עיר"
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr "ערוך שלט תחום עיר"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr "שם שני"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr "מצלמת מהירות"
@@ -14082,5 +14101,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr "טלפון חירום"
@@ -14088,5 +14107,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr ""
@@ -14094,5 +14113,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr ""
@@ -14101,10 +14120,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr "אזור צליחה"
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr "ערוך אזור צליחה"
@@ -14112,5 +14131,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr "מעבר הרים"
@@ -14118,5 +14137,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr "ערוך מעבר הרים"
@@ -14128,7 +14147,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr "הגבהה"
@@ -14136,5 +14155,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr "מחסומים"
@@ -14142,5 +14161,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr ""
@@ -14148,5 +14167,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr ""
@@ -14185,18 +14204,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr "תנועה מותרת:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr ""
@@ -14205,5 +14228,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr "מחסום"
@@ -14211,5 +14234,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr ""
@@ -14217,10 +14240,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr ""
@@ -14228,15 +14251,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr "דוקרנים"
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr "ערוך דוקרנים"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr "תא אגרה"
@@ -14244,5 +14267,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr "ערוך תא אגרה"
@@ -14250,10 +14273,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr "ביקורת גבולות"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr "ערוך ביקורת גבולות"
@@ -14263,5 +14286,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr ""
@@ -14270,5 +14293,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr ""
@@ -14277,5 +14300,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr "חומה"
@@ -14283,5 +14306,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr "חומת עיר"
@@ -14290,5 +14313,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr ""
@@ -14300,15 +14323,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr "כניסה"
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr "ערוך כניסה"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr "שער"
@@ -14316,50 +14339,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr "ערוך שער"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr ""
@@ -14367,15 +14390,26 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+msgid "Turnstile"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "ערוך טירה"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr ""
@@ -14386,10 +14420,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr "מים"
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr "מעיין"
@@ -14397,5 +14431,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr "ערוך מעיין"
@@ -14403,5 +14437,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr ""
@@ -14409,10 +14443,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr "נחל"
@@ -14420,10 +14454,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr "ערוך נחל"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr "תעלה"
@@ -14431,10 +14465,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr "ערוך תעלה"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr "נהר"
@@ -14444,5 +14478,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr "ערוך נהר"
@@ -14450,15 +14484,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr "ערוך מים"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr "אדמה"
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr "ערוך אדמה"
@@ -14466,15 +14500,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr ""
@@ -14482,15 +14516,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -14498,5 +14532,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr "גדת נחל"
@@ -14505,10 +14539,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr "ערוך גדת נחל"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr ""
@@ -14519,14 +14553,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr "ביצה"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr "אדמה בוצית"
@@ -14540,35 +14574,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr "ביצה"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr "מצע קנה-סוף"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr "ביצה מלוחה"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr "מנגרוב"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr "בוץ"
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr "ערוך בוץ"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr "חוף"
@@ -14576,20 +14610,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr "ערוך חוף"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr "מפרץ"
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr "ערוך מפרץ"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr "צוק"
@@ -14597,10 +14631,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr "ערוך צוק"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr "קו חוף"
@@ -14608,5 +14642,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr "ערוך קו חוף"
@@ -14614,5 +14648,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr "נתיב מעבורת"
@@ -14620,5 +14654,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr "ערוך מעבורת"
@@ -14627,5 +14661,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr "מספנה"
@@ -14633,10 +14667,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr "ערוך מספנה"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr ""
@@ -14644,5 +14678,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr ""
@@ -14650,5 +14684,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr ""
@@ -14656,15 +14690,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr ""
@@ -14673,5 +14707,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr ""
@@ -14679,20 +14713,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr ""
@@ -14701,15 +14735,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr ""
@@ -14717,10 +14751,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr ""
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr ""
@@ -14728,10 +14762,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr ""
@@ -14741,5 +14775,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr ""
@@ -14747,10 +14781,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr ""
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr ""
@@ -14758,5 +14792,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr ""
@@ -14786,8 +14820,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr ""
@@ -14801,35 +14835,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr ""
@@ -14837,45 +14871,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr ""
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr ""
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr "רכבת קלה"
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr "ערוך רכבת קלה"
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr "רכבת תחתית"
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr "ערוך רכבת תחתית"
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr ""
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr ""
@@ -14883,5 +14917,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -14890,14 +14924,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr ""
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr ""
@@ -14906,5 +14940,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr ""
@@ -14913,5 +14947,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr ""
@@ -14921,5 +14955,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr ""
@@ -14927,5 +14961,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr ""
@@ -14934,10 +14968,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr ""
@@ -14945,10 +14979,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr ""
@@ -14956,10 +14990,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr ""
@@ -14967,10 +15001,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr ""
@@ -14978,5 +15012,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr ""
@@ -14984,5 +15018,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr "תחנה"
@@ -14993,10 +15027,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr "ערוך תחנה"
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr "דלק"
@@ -15006,5 +15040,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr "ערוך דלק"
@@ -15020,5 +15054,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15028,5 +15062,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr ""
@@ -15034,41 +15068,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr ""
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr "שטיפה"
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr "ערוך שטיפת רכב"
@@ -15076,5 +15110,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr "חנות"
@@ -15082,15 +15116,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr "ערוך חנות רכב"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr "תיקונים"
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr "ערוך תיקוני רכבים"
@@ -15098,5 +15132,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr "השכרה"
@@ -15105,10 +15139,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr "ערוך השכרת רכב"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr "שיתוף"
@@ -15116,5 +15150,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr "ערוך שיתוף רכבים"
@@ -15122,5 +15156,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr ""
@@ -15129,5 +15163,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr "ערוך השכרת אופניים"
@@ -15136,15 +15170,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr "ערוך חנות אופניים"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "תחבורה ציבורית"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr ""
@@ -15152,5 +15186,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr ""
@@ -15158,5 +15192,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr ""
@@ -15164,5 +15198,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr ""
@@ -15171,5 +15205,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr ""
@@ -15177,5 +15211,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr ""
@@ -15184,5 +15218,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr ""
@@ -15194,5 +15228,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr ""
@@ -15200,10 +15234,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr "כניסת רכבת תחתית"
@@ -15212,10 +15246,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr "ערוך כניסת רכבת תחתית"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr ""
@@ -15224,5 +15258,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr "תחנת אוטובוס"
@@ -15231,5 +15265,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr "ערוך תחנת אוטובוס"
@@ -15237,5 +15271,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr ""
@@ -15245,5 +15279,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr ""
@@ -15254,6 +15288,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr "מקלט"
@@ -15261,10 +15295,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr ""
@@ -15272,5 +15306,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr "מונית"
@@ -15278,5 +15312,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr "ערוך תחנת מוניות"
@@ -15284,5 +15318,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr "שדה תעופה"
@@ -15290,15 +15324,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr "ערוך שדה תעופה"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr ""
@@ -15307,5 +15341,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr "לינה"
@@ -15317,5 +15351,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "מלון"
@@ -15324,15 +15358,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr ""
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr ""
@@ -15340,20 +15374,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr ""
@@ -15361,10 +15395,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr ""
@@ -15372,30 +15406,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr ""
@@ -15403,10 +15437,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "מזון ושתיה"
@@ -15417,5 +15451,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "מסעדה"
@@ -15423,5 +15457,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr ""
@@ -15429,5 +15463,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr ""
@@ -15435,61 +15469,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr "קבב"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr "תורכי"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr "אסייתי"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr "תאילנדי"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr "מקסיקני"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr "יפני"
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr "מזון מהיר"
@@ -15497,9 +15531,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr "ערוך מסעדת מזון מהיר"
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr "בית קפה"
@@ -15507,10 +15541,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr "ערוך בית קפה"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr "פאב"
@@ -15518,20 +15552,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr "ערוך פאב"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr "בר"
@@ -15539,10 +15573,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr "ערוך בר"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr "מועדון לילה"
@@ -15550,20 +15584,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr "ערוך מועדון לילה"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "תיירות"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr ""
@@ -15572,11 +15606,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr "שעות פתיחה"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "מוזיאון"
@@ -15584,10 +15618,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr "ערוך מוזיאון"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "גן חיות"
@@ -15596,10 +15630,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr "ערוך גן חיות"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr "נקודת תצפית"
@@ -15607,25 +15641,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr "ערוך נקודת תצפית"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr "מגדל תצפית"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr "פארק שעשועים"
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr "ערוך פארק שעשועים"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr "יצירת אומנות"
@@ -15633,5 +15667,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr "ערוך יצירת אומנות"
@@ -15639,5 +15673,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr ""
@@ -15645,80 +15679,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr ""
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "מפה"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr ""
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr "מפה"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr "מפת עיר"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr "מפת צעידה"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr "מפת רכיבה"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
 msgid "Closer Description"
 msgstr ""
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1701
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Board Type"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "board"
 msgstr ""
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "history"
 msgstr "היסטוריה"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "nature"
 msgstr "טבע"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "wildlife"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Guidepost (Hiking)"
 msgstr ""
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr "ערוך מקלט"
@@ -15726,25 +15760,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr "אתר פיקניק"
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr "ערוך אתר פיקניק"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "מקומות היסטורים"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "טירה"
@@ -15753,20 +15787,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr "ערוך טירה"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "חורבות"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr "ערוך חורבות"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr "אתר ארכיאולוגי"
@@ -15775,10 +15809,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr "ערוך אתר ארכיאולוגי"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr "שדה קרב"
@@ -15786,5 +15820,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr "ערוך שדה קרב"
@@ -15792,15 +15826,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr "אנדרטה"
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr "ערוך אנדרטה"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr "מצבת זיכרון"
@@ -15808,45 +15842,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr "ערוך מצבת זיכרון"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "פנאי"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr "פארק מים"
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr "ערוך פארק מים"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "מגרש משחקים"
@@ -15854,15 +15888,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr "ערוך מגרש משחקים"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "דייג"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr "ערוך דייג"
@@ -15870,15 +15904,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr "מתקני ספורט"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "איצטדיון"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr "ערוך איצטדיון"
@@ -15892,6 +15926,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "בחר ענף ספורט:"
@@ -15914,4 +15948,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -15972,5 +16014,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -15980,5 +16030,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16124,5 +16174,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16228,5 +16278,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16267,29 +16317,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr "ספורט"
@@ -16299,227 +16350,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr "קשתות"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr "אתלטיקה"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr "כדורגל אוסטרלי"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr "כדור בסיס"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr "כדורסל"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr "כדורת דשא"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr "קנו"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr "טיפוס"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr "קריקט"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr "מירוץ כלבים"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr "כדורגל אמריקאי"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr "גולף"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr "התעמלות"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr "הוקי"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr "מירוץ סוסים"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr "רוגבי"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr "סקייטבורד"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr "סקייטים"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr "סקי"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "כדורגל"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr "שחייה"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "טניס שולחן"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr "טניס"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr "מרכז ספורט"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr "ערוך מרכז ספורט"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr "מסלול מירוצים"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr "ערוך מסלול מירוצים"
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr "מגרש גולף"
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr "ערוך מגרש גולף"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr "מיני-גולף"
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr "ערוך מיני-גולף"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr "ספורט"
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr ""
@@ -16558,191 +16609,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr "מרכז ספורט"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr "איצטדיון"
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr "אתלטיקה"
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr "ערוך אתלטיקה"
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr "קשתות"
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr "ערוך קשתות"
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr "טיפוס"
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr "ערוך טיפוס"
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr ""
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr "רכיבה"
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr "ערוך רכיבה"
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr "מירוץ כלבים"
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr "ערוך מירוץ כלבים"
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr "מירוץ סוסים"
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr "ערוך מירוץ סוסים"
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr "התעמלות"
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr "ערוך התעמלות"
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr "ספורט מוטורי"
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr "ערוך ספורט מוטורי"
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr "סקייטבורד"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr "ערוך סקייטבורד"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr "שחייה"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr "ערוך שחייה"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr "סקי"
@@ -16750,56 +16801,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr "ערוך סקי"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr "סוג מסלול"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr "גלישה במורד"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr "פארק שלג"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr "קושי"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr "מתחילים"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr "קל"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr "מקצוענים"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr "ירי"
@@ -16807,178 +16858,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr "ערוך ירי"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr "ספורט (משחקי כדור)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr "כדורגל"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr "ערוך כדורגל"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr "כדורגל אמריקאי"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr "ערוך כדורגל אמריקאי"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr "כדורגל אוסטרלי"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr "ערוך כדורגל אוסטרלי"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr "כדור בסיס"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr "ערוך כדור בסיס"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr "כדורסל"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr "ערוך כדורסל"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr "גולף"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr "ערוך גולף"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr "מגרש גולף"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr "כדורת דשא"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr "ערוך כדורת דשא"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr "הוקי"
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr "ערוך הוקי"
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr "רוגבי"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr "ערוך רוגבי"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr "טניס שולחן"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr "ערוך טניס שולחן"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr "טניס"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr "ערוך טניס"
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "מבנים"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr "מבנה"
@@ -16986,5 +17037,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "מבנה ציבור"
@@ -16992,10 +17043,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr "ערוך מבנה ציבור"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "בניין העירייה"
@@ -17003,10 +17054,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "ערוך בניין העירייה"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "שגרירות"
@@ -17014,10 +17065,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "ערוך שגרירות"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "בית משפט"
@@ -17026,10 +17077,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "ערוך בית משפט"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "כלא"
@@ -17038,10 +17089,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "ערוך כלא"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "משטרה"
@@ -17051,10 +17102,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "ערוך משטרה"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "תחנת מכבי אש"
@@ -17063,10 +17114,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "ערוך תחנת מכבי אש"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "דואר"
@@ -17074,5 +17125,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr "ערוך דואר"
@@ -17080,15 +17131,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr "גן ילדים"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr "ערוך גן ילדים"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "בית ספר"
@@ -17096,10 +17147,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "ערוך בית ספר"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr "אוניברסיטה"
@@ -17107,10 +17158,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr "ערוך אוניברסיטה"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr "מכללה"
@@ -17118,5 +17169,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr "ערוך מכללה"
@@ -17124,5 +17175,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "קולנוע"
@@ -17131,10 +17182,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "ערוך קולנוע"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "ספרייה"
@@ -17143,10 +17194,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "ערוך ספרייה"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr "מרכז אומנויות"
@@ -17154,10 +17205,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr "ערוך מרכז אומנויות"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "תיאטרון"
@@ -17166,10 +17217,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "ערוך תיאטרון"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr "מקום תפילה"
@@ -17179,5 +17230,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr "ערוך מקום תפילה"
@@ -17186,6 +17237,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr "דת"
@@ -17194,66 +17245,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr "בהאי"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr "בודהיסט"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr "נוצרי"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr "הינדי"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr "יהודי"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr "מוסלמי"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr "סיקי"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr "ספיריטואליסט"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr "טאואיסט"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr ""
@@ -17262,81 +17313,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr "אנגליקני"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr "באפטיסט"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr "קתולי"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr "לותרני"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr "מתודיסט"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr "מורמוני"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr "אורתודוקסי"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr "פרוטסטנטי"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr "שיעי"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr "סוני"
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr "כתובות"
@@ -17345,5 +17396,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr "ערוך כתובת"
@@ -17351,5 +17402,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr "מספר בית"
@@ -17357,20 +17408,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr "שם בית"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr "שם עיר"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "מיקוד"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr "קוד מדינה"
@@ -17378,5 +17429,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr ""
@@ -17385,5 +17436,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -17391,71 +17442,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr "סכמת מספור"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr "אי-זוגי"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr "זוגי"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr "הכל"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr "מעשה אדם"
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "מגדל"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "ערוך מגדל"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "מגדל מים"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "ערוך מגדל מים"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "מגדלור"
@@ -17463,10 +17514,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "ערוך מגדלור"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "טחנת רוח"
@@ -17474,10 +17525,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "ערוך טחנת רוח"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "צינור"
@@ -17485,10 +17536,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "ערוך צינור"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr ""
@@ -17498,10 +17549,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr ""
@@ -17509,10 +17560,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr ""
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr ""
@@ -17520,10 +17571,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr ""
@@ -17531,10 +17582,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr ""
@@ -17542,5 +17593,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr ""
@@ -17548,5 +17599,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr ""
@@ -17556,39 +17607,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr "תחנת כח"
@@ -17597,10 +17648,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr "ערוך תחנת כח"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr ""
@@ -17609,5 +17660,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -17615,10 +17666,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr "עמוד חשמל"
@@ -17629,5 +17680,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr "ערוך עמוד חשמל"
@@ -17635,5 +17686,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr "קו מתח"
@@ -17642,25 +17693,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr "ערוך קו מתח"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "שירותים"
@@ -17668,20 +17719,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr "תיבת דואר"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "טלפון"
@@ -17690,5 +17741,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr "ערוך טלפון"
@@ -17696,5 +17747,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr ""
@@ -17702,5 +17753,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr ""
@@ -17708,5 +17759,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -17714,5 +17765,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr ""
@@ -17720,15 +17771,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "כרטיסי טלפון"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr ""
@@ -17737,5 +17788,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr "ערוך תחנת מיחזור"
@@ -17743,35 +17794,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr "ספסל"
@@ -17780,20 +17831,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr ""
@@ -17801,22 +17852,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr "מזרקה"
@@ -17825,10 +17876,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr "ערוך מזרקה"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "מי שתיה"
@@ -17837,10 +17888,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "ערוך מי שתיה"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr ""
@@ -17848,25 +17899,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "חנויות"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr "סופרמרקט"
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr "ערוך סופרמרקט"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr "מכולת"
@@ -17874,10 +17925,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr "ערוך מכולת"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr "קיוסק"
@@ -17885,10 +17936,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr "ערוך קיוסק"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "מכונת ממכר"
@@ -17896,5 +17947,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "ערוך מכונת ממכר"
@@ -17902,88 +17953,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr "כרטיסים לתחבורה ציבורית"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr "מפות תחבורה ציבורית"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr "כרטיסי חניה"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr "מזון"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "משקאות"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr "ממתקים"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr "סיגריות"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr "תמונות"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr "מזון בע\"ח"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "עיתונים"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "צעצועים"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr "בולים"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "כרטיס SIM"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr "שוברי טלפון"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr "שוברים"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr "קונדומים"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr "טמפונים"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr "שקיות צואה"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "קצבייה"
@@ -17991,10 +18042,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "ערוך קצבייה"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "מאפייה"
@@ -18002,10 +18053,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "ערוך מאפייה"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr "פרחים"
@@ -18013,20 +18064,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr "ערוך חנות פרחים"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr "ערוך חנות אורגנית"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr ""
@@ -18034,60 +18085,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr ""
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr ""
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr "ערוך חנות מחשבים"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr "ערוך חנות אלקטרוניקה"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr ""
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr "ערוך חנות רהיטים"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr ""
@@ -18095,10 +18146,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr ""
@@ -18106,10 +18157,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr "חנות עשה-זאת-בעצמך"
@@ -18117,60 +18168,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr "ערוך חנות עשה-זאת-בעצמך"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr ""
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr "מספרה"
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr "ערוך מספרה"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr "ערוך חנות נעליים"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr "ערוך חנות צעצועים"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr "ערוך חנות וידאו"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "ניקוי יבש"
@@ -18178,10 +18229,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "ערוך ניקוי יבש"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "מכבסה"
@@ -18189,10 +18240,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "ערוך מכבסה"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr ""
@@ -18200,35 +18251,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr "ערוך חנות ספורט"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr "ערוך אופטיקאי"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "מזומן"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "בנק"
@@ -18236,5 +18287,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "ערוך בנק"
@@ -18242,10 +18293,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "כספומט"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr "החלפת כסף"
@@ -18253,5 +18304,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr "ערוך החלפת כסף"
@@ -18259,15 +18310,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "ערוך כספומט"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "בריאות"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr "רופאים"
@@ -18275,20 +18326,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr "ערוך רופאים"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr "רופא שיניים"
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr "ערוך רופא שיניים"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "בית מרקחת"
@@ -18296,5 +18347,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "ערוך בית מרקחת"
@@ -18302,10 +18353,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "בית חולים"
@@ -18313,10 +18364,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "ערוך בית חולים"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr "נקודת גישה בחירום"
@@ -18325,5 +18376,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr "ערוך נקודת גישה בחירום"
@@ -18332,20 +18383,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr "מספר נקודה"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr "מספר טלפון"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(השתמש בקדומת בינלאומית, למשל +12-345-67890)"
@@ -18353,5 +18404,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr "וטרינרי"
@@ -18360,56 +18411,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr "ערוך וטרינרי"
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr "יבשת"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr "ערוך יבשת"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr "ארץ"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr "ערוך ארץ"
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr "מדינה"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr "ערוך מדינה"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr "אזור"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr "ערוך אזור"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr "מחוז"
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr "ערוך מחוז"
@@ -18417,15 +18467,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr "עיר"
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr "ערוך עיר"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr "עיירה"
@@ -18433,10 +18483,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr "ערוך עיירה"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr "פרבר"
@@ -18444,25 +18494,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr "ערוך פרבר"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "כפר"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "ערוך כפר"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr "כפר קטן"
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr "ערוך כפר קטן"
@@ -18470,5 +18520,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr "מקומיות"
@@ -18476,10 +18526,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr "ערוך מקומיות"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "אי"
@@ -18487,5 +18537,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "ערוך אי"
@@ -18493,5 +18543,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr "פתח מערה"
@@ -18499,10 +18549,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr "ערוך פתח מערה"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "פסגה"
@@ -18510,10 +18560,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "ערוך פסגה"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr "קרחון"
@@ -18521,10 +18571,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr "ערוך קרחון"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr "הר געש"
@@ -18532,70 +18582,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr "ערוך הר געש"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr "גבולות"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr "לאומי"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr "ערוך גבול לאומי"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr "מנהלי"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr "ערוך גבול מנהלי"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr "אזרחי"
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr "ערוך תחום אזרחי"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr "פוליטי"
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr "ערוך תחום פוליטי"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr "גן לאומי"
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr "ערוך תחום גן לאומי"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "עץ"
@@ -18604,15 +18654,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "ערוך עץ"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr "שם בוטני"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr "חורש"
@@ -18621,5 +18671,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr "ערוך חורש"
@@ -18627,17 +18677,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr "מחטני"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr "נשיר"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr "מעורב"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "יער"
@@ -18646,14 +18696,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -18661,25 +18711,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr ""
@@ -18687,10 +18737,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr "שדה-בור"
@@ -18698,5 +18748,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr "ערוך שדה-בור"
@@ -18704,5 +18754,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr "חצר משק"
@@ -18711,45 +18761,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr "אדמה חקלאית"
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr "כרם"
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -18757,25 +18807,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr "דשא"
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr ""
@@ -18783,10 +18833,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr ""
@@ -18794,20 +18844,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr ""
@@ -18815,5 +18865,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -18821,15 +18871,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr "אזור מגורים"
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr "בית-קברות"
@@ -18837,9 +18887,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr "ערוך בית-קברות"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr "בית עלמין"
@@ -18847,39 +18897,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr "קמעוני"
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr "מסחרי"
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr "תעשייתי"
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr ""
@@ -18887,15 +18937,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr "צבאי"
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr ""
@@ -18903,55 +18953,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr "אתר בניה"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr "מחצבה"
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr ""
@@ -18961,5 +19011,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr ""
@@ -18968,10 +19018,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr ""
@@ -18979,5 +19029,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr ""
@@ -18986,5 +19036,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -18992,34 +19042,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr ""
@@ -19028,15 +19078,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr ""
@@ -19044,5 +19094,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr ""
@@ -19051,5 +19101,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr ""
@@ -19057,5 +19107,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr ""
@@ -19127,24 +19177,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr "אופניים"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr "אוטובוס"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr ""
@@ -19197,20 +19247,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr "רגל"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr ""
@@ -19224,10 +19274,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr "רכבת תחתית"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr ""
@@ -19235,26 +19285,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr ""
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "סובב"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr ""
@@ -19263,30 +19319,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr ""
@@ -19322,6 +19378,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19337,5 +19394,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19354,5 +19419,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr "סטנדרטי"
@@ -19446,7 +19511,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr "גשר"
@@ -19711,15 +19776,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr "מיושן"
@@ -19761,5 +19826,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr "סוס"
@@ -19897,4 +19962,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19906,5 +19977,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19912,5 +19983,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19947,5 +20018,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19969,11 +20040,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr ""
@@ -19997,5 +20068,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20036,5 +20107,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20072,6 +20143,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr "רחוב"
@@ -20127,7 +20198,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr ""
@@ -20180,11 +20251,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr ""
@@ -20205,5 +20284,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr ""
@@ -20217,5 +20296,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr ""
@@ -20236,5 +20315,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr ""
@@ -20248,6 +20327,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr ""
@@ -20262,5 +20341,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr "גדת נחל"
@@ -20274,5 +20353,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr "זרם"
@@ -20286,5 +20365,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr ""
@@ -20312,5 +20391,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr "אקוודוקט"
@@ -20453,5 +20532,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20478,13 +20557,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr "מעשה אדם"
@@ -20546,7 +20625,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr ""
@@ -20569,10 +20648,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr ""
@@ -20608,7 +20687,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr ""
@@ -20653,6 +20732,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr ""
@@ -20666,5 +20745,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr "מסוף"
@@ -20686,5 +20765,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr ""
@@ -20698,5 +20777,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr ""
@@ -20704,4 +20783,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20744,7 +20830,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr ""
@@ -20761,5 +20847,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr "מסלול קל"
@@ -20774,5 +20860,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr "מסלול בינוניים"
@@ -20787,5 +20873,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr "מסלול מתקדמים"
@@ -20800,5 +20886,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr ""
@@ -20813,5 +20899,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr ""
@@ -20826,5 +20912,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr "מסלול מתחילים"
@@ -20847,4 +20933,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -20855,4 +20948,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -20929,10 +21030,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr "תחנת כח"
@@ -20946,5 +21048,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr "מזח"
@@ -20958,5 +21060,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr "צינור"
@@ -21084,12 +21186,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr "פנאי"
@@ -21103,5 +21205,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr ""
@@ -21173,8 +21275,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr ""
@@ -21276,10 +21378,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr ""
@@ -21299,4 +21401,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21318,4 +21427,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21639,4 +21755,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -21663,24 +21787,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr ""
@@ -21712,6 +21844,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr ""
@@ -21772,8 +21904,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr "בריאות"
@@ -22126,26 +22258,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr "חנות"
@@ -22200,5 +22332,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22217,8 +22349,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr "מלון"
@@ -22368,9 +22500,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr "תיירות"
@@ -22442,8 +22574,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr "היסטורי"
@@ -22514,8 +22646,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr "ירוק"
@@ -22529,5 +22661,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr "מחצבה"
@@ -22541,5 +22673,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr ""
@@ -22561,5 +22693,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr ""
@@ -22573,5 +22705,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr "יער"
@@ -22585,5 +22717,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr ""
@@ -22606,5 +22738,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr "קמעוני"
@@ -22618,5 +22750,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr "תעשייתי"
@@ -22630,5 +22762,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr ""
@@ -22642,5 +22774,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr ""
@@ -22654,5 +22786,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr ""
@@ -22709,7 +22841,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr "צבאי"
@@ -22723,5 +22855,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr "בית עלמין"
@@ -22734,5 +22866,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr "פיסגה"
@@ -22747,5 +22879,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr "קרחון"
@@ -22759,5 +22891,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr "הר געש"
@@ -22812,8 +22944,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr "טבעי"
@@ -22827,5 +22959,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr ""
@@ -22839,5 +22971,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr ""
@@ -22851,5 +22983,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr ""
@@ -22863,5 +22995,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr "בוץ"
@@ -22875,5 +23007,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr "חוף"
@@ -22951,8 +23083,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr ""
@@ -23000,7 +23132,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr "גבול"
@@ -23142,10 +23274,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr "מקום"
@@ -23193,6 +23325,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr "כתובת"
@@ -23489,18 +23621,15 @@
 msgstr ""
 
+#~ msgid "Move"
+#~ msgstr "הזז"
+
+#~ msgid "Data Layer"
+#~ msgstr "שכבת נתונים"
+
+#~ msgid "Not implemented yet."
+#~ msgstr "עדיין לא הוטמע."
+
 #~ msgid "Unknown file extension."
 #~ msgstr "סיומת הקובץ אינה ידועה."
-
-#~ msgid "Move"
-#~ msgstr "הזז"
-
-#~ msgid "end"
-#~ msgstr "סוף"
-
-#~ msgid "Data Layer"
-#~ msgstr "שכבת נתונים"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "עדיין לא הוטמע."
 
 #~ msgid "Email"
@@ -23594,7 +23723,4 @@
 #~ msgid "Some of the nodes are (almost) in the line"
 #~ msgstr "כמה מהנקונות הן (כמעט) באותו קו"
-
-#~ msgid "Rotate"
-#~ msgstr "סובב"
 
 #~ msgid "Change"
@@ -23653,4 +23779,7 @@
 #~ msgstr "בדוק תקינות"
 
+#~ msgid "end"
+#~ msgstr "סוף"
+
 #~ msgid "image not loaded"
 #~ msgstr "תמונה לא נטענה"
Index: /applications/editors/josm/i18n/po/is.po
===================================================================
--- /applications/editors/josm/i18n/po/is.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/is.po	(revision 17069)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
-"PO-Revision-Date: 2009-08-06 21:57+0000\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
+"PO-Revision-Date: 2009-08-10 13:33+0000\n"
 "Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
 "Language-Team: Icelandic <is@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-10 11:57+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -56,6 +56,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -100,6 +100,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "Villa"
@@ -110,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "Óvistaðar breytingar"
@@ -128,10 +128,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -148,15 +148,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -186,6 +186,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -215,5 +215,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -369,5 +369,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
 msgstr "Sameina"
@@ -451,9 +451,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -486,7 +486,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -567,37 +567,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "gögnum"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "lagi"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "vali"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "árekstri"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "niðurhali"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Þysja að {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Þysja að {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -607,30 +607,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "Ekkert er valið til að þysja að."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "Sameina vegi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "Sameina marga vegi í einn."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "Vinsamlegast veldu a.m.k. tvo vegi til að sameina."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr "Sameina vegi sem eru stak í mismunandi venslum?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -640,13 +640,13 @@
 "það?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "Sameina þá"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "Skipta um átt?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -656,10 +656,10 @@
 "haldist sér. Vilt þú skipta um átt sumra þeirra?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "Skipta um átt og sameina"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -667,20 +667,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Leysa árekstra"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Sameina {0} vegi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -727,6 +727,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -748,6 +748,6 @@
 msgstr "Eyða völdum hlutum."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -757,5 +757,5 @@
 msgstr "Yfirskrifa"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -887,7 +887,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "Vista gögnin í GPX sniði."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -903,5 +902,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -919,5 +918,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -989,22 +988,22 @@
 msgstr "Sameina það lag sem nú er valið öðru lagi"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "Sameina hnúta"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "Sameina valda hnúta á staðsetningu þess elsta."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "Veldu minnst tvo hnúta til að sameina."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr "Sameina hnúta sem eru stak í mismunandi venslum?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1014,13 +1013,13 @@
 "það?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "Gat ekki sameinað hnúta: Hefði þurft að eyða veg sem enn er í notkun."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1853,5 +1852,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1863,5 +1862,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr ""
@@ -1898,11 +1897,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2040,5 +2039,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2109,5 +2108,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Leita að hlutum."
@@ -2240,5 +2239,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Leit"
@@ -2436,5 +2435,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2477,5 +2476,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr "Fjarlægja úr venslum"
@@ -2515,9 +2514,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "{0} hnútur"
-msgstr[1] "{0} hnútar"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2553,9 +2552,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "{0} hnútur"
-msgstr[1] "{0} hnútar"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2717,7 +2716,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "Breyta {0} hlut"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2727,5 +2726,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2772,5 +2771,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2803,5 +2802,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2815,5 +2814,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr ""
@@ -2828,5 +2827,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3105,5 +3104,5 @@
 msgstr "Ekki sýna þessi skilaboð aftur"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3112,5 +3111,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3120,10 +3119,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3131,25 +3130,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "óskilgreint"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3159,9 +3158,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3170,9 +3169,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "Óvænt villa"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3182,9 +3193,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3194,5 +3205,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr ""
@@ -3276,10 +3287,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "Notandanafn"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "Lykilorð"
@@ -3481,15 +3492,15 @@
 msgstr "(enginn hlutur)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3543,5 +3554,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr ""
@@ -3550,5 +3561,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr ""
@@ -3557,20 +3568,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3580,6 +3591,6 @@
 msgstr "Tögg"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3587,6 +3598,6 @@
 msgstr "Hnútar"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3594,40 +3605,40 @@
 msgstr "Stök"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3635,74 +3646,74 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3710,30 +3721,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3741,5 +3752,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3747,13 +3758,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3761,5 +3772,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3767,21 +3778,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3790,27 +3801,27 @@
 msgstr "Fjarlægja"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3818,5 +3829,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3825,5 +3836,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3832,5 +3843,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3839,5 +3850,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -3846,21 +3857,21 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -3870,5 +3881,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -3878,5 +3889,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -3884,19 +3895,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -3905,19 +3916,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -3926,9 +3937,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -3938,13 +3949,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -3952,90 +3963,90 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4045,17 +4056,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4064,14 +4075,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4079,21 +4090,21 @@
 msgstr "Hlutverk"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4101,14 +4112,14 @@
 msgstr "<óskilgreint>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4116,7 +4127,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4128,7 +4139,7 @@
 msgstr "Lykill"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4141,45 +4152,45 @@
 msgstr "Gildi"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr ""
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4199,8 +4210,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4237,5 +4248,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4337,83 +4348,83 @@
 msgstr "Sýna breytingasögu valdra hluta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "Lög"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "Sýna lista yfir öll lög."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "Eyða völdu lagi."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr "Eyða laginu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr "Ert þú viss um að þú viljir eyða laginu „{0}“?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr "Já"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr "Eyða öllum lögunum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr "Eyði lagi {0} af {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "Sýna/Fela"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "Sýna eða fela valið lag."
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
 msgstr "Virkja valið lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr "Sameina þetta lag öðru lagi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "Færa valið lag upp í röðinni"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "Færa valið lag niður í röðinni"
@@ -4423,6 +4434,6 @@
 msgstr "Upplýsingar um lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4431,22 +4442,22 @@
 msgstr[1] "Allt að {0} hlutum verður breytt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "Tómt gildi eyðir lyklinum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<mismunandi>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "Breyta eigindum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4454,5 +4465,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4461,40 +4472,40 @@
 msgstr[1] "Breyta eigindum allt að {0} hluta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "Veldu lykil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "Veldu gildi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 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/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "Eigindi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "Eigindi valdra hluta."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "Stak í"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "Bæti vað eigindum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4511,39 +4522,39 @@
 msgstr "Bæta við"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 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/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "Breyta eigindum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 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/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "Breyta venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Eyða valinu úr venslunum {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "Eyða völdum lykil í öllum völdum hlutumaccess"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "Eyða eigindum"
@@ -4555,5 +4566,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "Vensl"
@@ -4585,31 +4596,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "Núverandi val"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "Opna vallistann."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "Þysja að völdum hlut(um)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "Þysja að vali"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Val: Vensl:{0} / Vegir:{1} / Nódur:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4617,5 +4628,5 @@
 msgstr "Val"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4624,5 +4635,5 @@
 msgstr[1] "{0} vegir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4631,5 +4642,5 @@
 msgstr[1] "{0} vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -4841,7 +4852,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "Eyða völdum venslum"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -4924,5 +4934,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5163,5 +5173,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "Staðir"
@@ -5208,21 +5218,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "gerð"
@@ -6022,72 +6032,509 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "Heiti"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+"<html>Útgáfa <strong>{0}</strong> búin til <strong>{1}</strong> af <strong>"
+"{2}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr "Útgáfa {0} búin til {1} af {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr "Útgáfa"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "Les {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "Samstilla klukkur"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG myndir (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "Sérsníða teikningu lína"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "Sérsníða liti"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Veldu lit"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "Flytja inn hljóð"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "Flytja inn myndir"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} ferill, "
+msgstr[1] "{0} ferlar, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} leið, "
+msgstr[1] "{0} leiðir, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} punktur"
+msgstr[1] "{0} punktar"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr "Tímaspan: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr "Lengd: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "Breyta í gagnalag"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km²"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Gagnalag {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr "útgáfa {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "Tölfræði um {0}:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr "API útgáfa: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr "Breyta í GPX-lag"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6096,7 +6543,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6106,442 +6553,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "Heiti"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-"<html>Útgáfa <strong>{0}</strong> búin til <strong>{1}</strong> af <strong>"
-"{2}</strong></html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr "Útgáfa {0} búin til {1} af {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr "Útgáfa"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Les {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "Samstilla klukkur"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG myndir (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "Sérsníða teikningu lína"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "Sérsníða liti"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Veldu lit"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "Flytja inn hljóð"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "Flytja inn myndir"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} ferill, "
-msgstr[1] "{0} ferlar, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} leið, "
-msgstr[1] "{0} leiðir, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} punktur"
-msgstr[1] "{0} punktar"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr "Tímaspan: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr "Lengd: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "Breyta í gagnalag"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km²"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Gagnalag {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr "útgáfa {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "Tölfræði um {0}:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr "API útgáfa: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr "Breyta í GPX-lag"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -6911,5 +6921,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "Bíll"
@@ -6926,16 +6936,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "Hjól"
@@ -6963,14 +6975,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "Fótgangandi"
@@ -7181,19 +7196,19 @@
 msgstr "Tungumál"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr ""
@@ -7323,36 +7338,11 @@
 msgstr "Lykilorð á milliþjóni"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr "Notandanafn (eða netfang) á OSM þjóninum."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"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ð."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "Slóð OSM þjóns"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr "OSM notandanafn (netfang)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "OSM lykilorð"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -7701,7 +7691,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "Gat ekki lesið frá veffang: \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -7802,7 +7792,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "Óþekkt hlutverk \"{0}\"."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -7960,23 +7950,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "Rangt lykilorð eða notandanafn"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Viðvörun: Lykilorðið er sent ódulkóðað"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "Vista notandanafn og lykilorð (ódulkóðað)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "Sláðu inn lykilorð"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
 msgstr "Innskrá"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr "Notandanafn (eða netfang) á OSM þjóninum."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"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ð."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr "OSM notandanafn (netfang)"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "OSM lykilorð"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -8139,14 +8154,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "Óþekkt útgáfa: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "Undirbý OSM gögn..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr "Illa-formað kenni á hnút"
@@ -8601,5 +8616,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr "Lýsing"
@@ -9000,5 +9015,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr ""
@@ -9323,5 +9338,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -9857,7 +9872,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr "vatn"
@@ -10030,7 +10045,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "nafn"
+msgstr ""
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10580,12 +10594,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "{0} vegur"
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0} hnútur"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -10723,5 +10737,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr "Nafn götu"
@@ -11530,7 +11544,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr "bygging"
@@ -11544,5 +11558,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr ""
@@ -11775,12 +11789,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "Veldu hlut til að breyta fyrst."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "Veldu lag til að sameina"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
@@ -11793,7 +11805,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "Engar  breytingar til að hlaða upp."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -11804,61 +11815,61 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr "Sjálfvirkt niðurhal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr "Niðurhala sýnilega reiti"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr "Breyta upplausn"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr "Hlaða reiti sem innihalda villur"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr "Vista WMS lag í skrá"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr "Hlaða WMS lag úr skrá"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr ""
@@ -12186,4 +12197,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12220,5 +12233,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr "Stræti"
@@ -12229,5 +12242,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Hraðbraut"
@@ -12236,5 +12249,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr "Breyti hraðbraut"
@@ -12261,8 +12274,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr "Tilvísun"
@@ -12303,21 +12316,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr "Lag"
@@ -12331,8 +12344,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr "Akreinar"
@@ -12350,15 +12363,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr "Hámarkshraði (km/klst)"
@@ -12395,16 +12408,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr "Einstefnuvegur"
@@ -12446,19 +12459,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Brú"
@@ -12494,19 +12507,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr "Göng"
@@ -12540,18 +12553,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr "Niðurgrafinn"
@@ -12585,18 +12598,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr "Upphækkun"
@@ -12604,5 +12617,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr "Tengibraut á hraðbraut"
@@ -12611,5 +12624,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr "Breyti tengibraut á hraðbraut"
@@ -12617,5 +12630,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr "Stofnvegur"
@@ -12624,5 +12637,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr "Breyti stofnveg"
@@ -12632,6 +12645,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr "Hraðbrautarlíkar aðgangstakmarkanir"
@@ -12639,5 +12652,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr "Tengivegur á stofnveg"
@@ -12646,5 +12659,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr "Breyti tengiveg á stofnveg"
@@ -12657,5 +12670,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Fyrsta stigs"
@@ -12664,5 +12677,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr "Breyti fyrsta stigs veg"
@@ -12670,10 +12683,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr "Tengivegur á fyrsta stigs veg"
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr ""
@@ -12685,5 +12698,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Annars stigs vegur"
@@ -12693,5 +12706,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr "Breyti annars stigs veg"
@@ -12699,5 +12712,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr "Þriðja stigs vegur"
@@ -12707,5 +12720,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr "Breyti þriðja stigs veg"
@@ -12717,5 +12730,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Óflokkaður"
@@ -12725,5 +12738,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr "Breyti óflokkuðum veg"
@@ -12750,19 +12763,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr "Breidd (í metrum)"
@@ -12774,5 +12787,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Íbúðargata"
@@ -12781,5 +12794,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr "Breyti íbúðargötu"
@@ -12803,13 +12816,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr "Slitlag"
@@ -12829,20 +12842,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr "malbikaður"
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr "ómalbikaður"
@@ -12850,12 +12863,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr "götusteinn"
@@ -12863,5 +12876,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr "Vistgata"
@@ -12870,5 +12883,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr "Breyti vistgötu"
@@ -12876,5 +12889,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr "Þjónustuvegur"
@@ -12883,5 +12896,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr "Breyta þjónustuveg"
@@ -12891,18 +12904,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr "Gerð þjónustuvegs"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr "port"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr "heimreið"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr "bílastæðavegur"
@@ -12910,5 +12923,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr "Bílastæðavegur"
@@ -12918,5 +12931,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr "Breyti bílastæðaveg"
@@ -12924,5 +12937,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr "Vegur (óþekkt flokkun)"
@@ -12931,5 +12944,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr "Breyti veg af óþekktri flokkun"
@@ -12938,20 +12951,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr "Vegtakmarkanir"
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr "Breyti vegtakmörkunum"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr "Tollur"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -12964,8 +12977,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr "Aðgangur"
@@ -13009,23 +13022,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr "já"
@@ -13038,40 +13051,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr "einkavegur"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr ""
@@ -13084,19 +13097,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr ""
@@ -13119,65 +13132,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr "leyfður"
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr "í landbúnaðarskyni"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr "nei"
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -13192,10 +13205,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr "Hestar"
@@ -13211,13 +13224,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr "Vélhjól"
@@ -13233,30 +13246,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr "Bifreið"
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr ""
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr "Lámarkshraði (km/klst)"
@@ -13264,25 +13277,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr "Hámarksþyngt (í tonnum)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr "Hámarkshæð (í metrum)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr "Hámarksbreidd (í metrum)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr "Hámarkslengd (í metrum)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr "Hringtorg"
@@ -13293,5 +13306,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr "Breyti hringtorgi"
@@ -13313,9 +13326,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr "Gerð"
@@ -13335,10 +13348,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr "hraðbraut"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr "tengibraut á hraðbraut"
@@ -13360,10 +13373,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr "stofnvegur"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr ""
@@ -13385,10 +13398,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr ""
@@ -13410,6 +13423,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr ""
@@ -13423,9 +13436,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr "óflokkaður"
@@ -13439,9 +13452,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr "íbúðargata"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr "vistgata"
@@ -13471,10 +13484,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr "þjónustuvegur"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr ""
@@ -13482,4 +13495,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13497,6 +13517,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr "byggingarsvæði"
@@ -13507,10 +13527,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr "Breyti brú"
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr "Breyti göngum"
@@ -13518,19 +13538,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr "Vegir"
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr "Í byggingu"
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr "Breyti veg í byggingu"
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr "Hringtorg"
@@ -13546,5 +13566,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr "hringtorg"
@@ -13553,5 +13573,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr "Reiðstígur"
@@ -13559,5 +13579,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr "Breyti reiðstíg"
@@ -13565,5 +13585,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr "Hjólastígur"
@@ -13573,5 +13593,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr "Breyti hjólastíg"
@@ -13579,5 +13599,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr "Göngustígur"
@@ -13586,5 +13606,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr "Breyti göngustíg"
@@ -13592,5 +13612,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr "Göngugata"
@@ -13599,5 +13619,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr "Breyti göngugötu"
@@ -13605,5 +13625,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr "Stigi"
@@ -13613,5 +13633,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr "Breyti stiga"
@@ -13620,5 +13640,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr ""
@@ -13627,14 +13647,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr ""
@@ -13642,18 +13662,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr ""
@@ -13661,5 +13681,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr ""
@@ -13668,5 +13688,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr ""
@@ -13674,5 +13694,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr ""
@@ -13681,5 +13701,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr ""
@@ -13687,5 +13707,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr ""
@@ -13694,5 +13714,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr ""
@@ -13700,5 +13720,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr ""
@@ -13707,5 +13727,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr ""
@@ -13713,5 +13733,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr ""
@@ -13720,5 +13740,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -13727,5 +13747,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr ""
@@ -13734,13 +13754,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr ""
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr ""
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr ""
@@ -13748,5 +13768,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr ""
@@ -13756,5 +13776,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr ""
@@ -13762,5 +13782,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr ""
@@ -13770,5 +13790,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr ""
@@ -13776,5 +13796,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr ""
@@ -13784,5 +13804,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr ""
@@ -13790,5 +13810,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr ""
@@ -13798,5 +13818,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr ""
@@ -13804,5 +13824,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr ""
@@ -13812,5 +13832,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr ""
@@ -13818,5 +13838,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr ""
@@ -13826,5 +13846,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr ""
@@ -13832,10 +13852,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr "Vegpunktar"
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr ""
@@ -13843,15 +13863,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr "Tilvísun"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr ""
@@ -13859,5 +13879,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr ""
@@ -13892,14 +13912,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr "Rekstraraðili"
@@ -13908,5 +13928,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr "Umferðarljós"
@@ -13916,5 +13936,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -13923,27 +13943,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr "eyja"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr ""
@@ -13951,6 +13971,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr ""
@@ -13959,11 +13979,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -13971,30 +13991,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr ""
@@ -14002,5 +14022,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr "Gangbraut"
@@ -14009,14 +14029,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr "Smáhringtorg"
@@ -14027,14 +14047,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr "Átt"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr "réttsælis"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr "Beygjuhringur"
@@ -14044,20 +14064,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr "Borgarmörk"
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr "Breyti borgarmarkaskilti"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr "Hraðamyndavél"
@@ -14065,5 +14085,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr "Neyðarsími"
@@ -14071,5 +14091,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr ""
@@ -14077,5 +14097,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr ""
@@ -14084,10 +14104,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr "Vað"
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr "Breyti vaði"
@@ -14095,5 +14115,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr "Skarð"
@@ -14101,5 +14121,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr "Breyti skarði"
@@ -14111,7 +14131,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr "Hæð (y/s)"
@@ -14119,5 +14139,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr "Tálmar"
@@ -14125,5 +14145,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr ""
@@ -14131,5 +14151,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr ""
@@ -14168,18 +14188,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr "Leyfileg umferð:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr ""
@@ -14188,5 +14212,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr ""
@@ -14194,5 +14218,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr "Rimlahlið"
@@ -14200,10 +14224,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr "Breyti rimlahliði"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr ""
@@ -14211,15 +14235,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr "Tollskýli"
@@ -14227,5 +14251,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr "Breyti tollskýli"
@@ -14233,10 +14257,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr "Landamæraeftirlit"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr "Breyti landamæraeftirliti"
@@ -14246,5 +14270,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr "Limgerði"
@@ -14253,5 +14277,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr ""
@@ -14260,5 +14284,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr ""
@@ -14266,5 +14290,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr "Borgarveggur"
@@ -14273,5 +14297,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr ""
@@ -14283,15 +14307,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr "Inngangur"
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr "Breyti inngang"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr "Hlið"
@@ -14299,50 +14323,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr "Breyti hliði"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr "Liftuhlið"
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr "Breyti liftuhliði"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr ""
@@ -14350,15 +14374,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+#, fuzzy
+msgid "Turnstile"
+msgstr "Beygjuhringur"
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "Breyti göngum"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr ""
@@ -14369,10 +14405,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr "Vatn"
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr "Goshver"
@@ -14380,5 +14416,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr "Breyti goshver"
@@ -14386,5 +14422,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr "Frárennsli"
@@ -14392,10 +14428,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr "Breyti frárennsli"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr "Lækur"
@@ -14403,10 +14439,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr "Breyti læk"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr "Skipaskurður"
@@ -14414,10 +14450,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr "Breyti skipaskurð"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr "Á"
@@ -14427,5 +14463,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr "Breyti á"
@@ -14433,15 +14469,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr "Breyti vatni"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr "Breyti landi"
@@ -14449,15 +14485,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr ""
@@ -14465,15 +14501,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -14481,5 +14517,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr "Árbakki"
@@ -14488,10 +14524,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr "Breyti árbakka"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr "Votlendi"
@@ -14502,14 +14538,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr "Breyti votlendi"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr ""
@@ -14523,35 +14559,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr "Leðja"
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr "Breyti leðju"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr "Strönd"
@@ -14559,20 +14595,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr "Breyti strönd"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr "Flói"
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr "Breyti flóa"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr "Klettur"
@@ -14580,10 +14616,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr "Breyti klett"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr "Strandlengja"
@@ -14591,5 +14627,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr "Breyti strandlengju"
@@ -14597,5 +14633,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr "Siglingarleið ferju"
@@ -14603,5 +14639,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr ""
@@ -14610,5 +14646,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr ""
@@ -14616,10 +14652,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr "Skipakví"
@@ -14627,5 +14663,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr "Breyti skipakví"
@@ -14633,5 +14669,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr "Stífla"
@@ -14639,15 +14675,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr "Breyti stíflu"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr "Vatnspunktar"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr ""
@@ -14656,5 +14692,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr ""
@@ -14662,20 +14698,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr "Foss"
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr "Breyti fossi"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr ""
@@ -14684,15 +14720,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr "Smábátahöfn"
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr "Breyti smábátahöfn"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr "Bryggja"
@@ -14700,10 +14736,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr "Breyti bryggju"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr ""
@@ -14711,10 +14747,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr ""
@@ -14724,5 +14760,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr ""
@@ -14730,10 +14766,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr ""
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr ""
@@ -14741,5 +14777,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr ""
@@ -14769,8 +14805,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr ""
@@ -14784,35 +14820,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr ""
@@ -14820,45 +14856,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr ""
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr ""
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr ""
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr ""
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr ""
@@ -14866,5 +14902,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -14873,14 +14909,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr ""
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr ""
@@ -14889,5 +14925,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr ""
@@ -14896,5 +14932,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr ""
@@ -14904,5 +14940,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr ""
@@ -14910,5 +14946,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr ""
@@ -14917,10 +14953,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr "Skíðalyfta"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr "Stólalyfta"
@@ -14928,10 +14964,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr "Breyti stólalyftu"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr "Toglyfta"
@@ -14939,10 +14975,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr "Breyti toglyftu"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr ""
@@ -14950,10 +14986,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr ""
@@ -14961,5 +14997,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr ""
@@ -14967,5 +15003,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr ""
@@ -14976,10 +15012,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr ""
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr "Bensínstöð"
@@ -14989,5 +15025,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr "Breyti bensínstöð"
@@ -15003,5 +15039,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15011,5 +15047,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr "Breyti stæði"
@@ -15017,41 +15053,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr "slitlag"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr ""
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr "Bílaþvottastöð"
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr "Breyti bílaþvottastöð"
@@ -15059,5 +15095,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr "Búð"
@@ -15065,15 +15101,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr "Breyti bílabúð"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr ""
@@ -15081,5 +15117,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr "Leiga"
@@ -15088,10 +15124,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr "Breyti bílaleigu"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr ""
@@ -15099,5 +15135,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr ""
@@ -15105,5 +15141,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr "Breyti hjólastæði"
@@ -15112,5 +15148,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr "Breyti hjólaleigu"
@@ -15119,15 +15155,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr "Breyti hjólabúð"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "Almenningssamgöngur"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr "UIC-Tilvísun"
@@ -15135,5 +15171,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr ""
@@ -15141,5 +15177,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr ""
@@ -15147,5 +15183,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr ""
@@ -15154,5 +15190,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr ""
@@ -15160,5 +15196,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr ""
@@ -15167,5 +15203,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr ""
@@ -15177,5 +15213,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr ""
@@ -15183,10 +15219,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr ""
@@ -15195,10 +15231,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr ""
@@ -15207,5 +15243,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr "Strætóstöð"
@@ -15214,5 +15250,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr "Breyti strætóstöð"
@@ -15220,5 +15256,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr "Strætóstopp"
@@ -15228,5 +15264,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr "Breyti strætóstoppi"
@@ -15237,6 +15273,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr "Skýli"
@@ -15244,10 +15280,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr ""
@@ -15255,5 +15291,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr "Leigubílastöð"
@@ -15261,5 +15297,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr "Breyti leigubílastöð"
@@ -15267,5 +15303,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr "Flugvöllur"
@@ -15273,15 +15309,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr "Breyti flugvelli"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr ""
@@ -15290,5 +15326,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr "Gisting"
@@ -15300,5 +15336,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hótel"
@@ -15307,15 +15343,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr "Breyti hóteli"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr "Stjörnur"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr "Vegahótel"
@@ -15323,20 +15359,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr "Breyti vegahóteli"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr "Gistiheimili"
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr "Breyti gistiheimili"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr "Fjallakofi (e. Chalet)"
@@ -15344,10 +15380,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr "Breyti fjallakofa í svissneskum stíl (e. Chalet)"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr "Farfuglaheimili"
@@ -15355,30 +15391,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr "Breyti farfuglaheimili"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr "Húsbílastæði"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr "Breyti húsbílastæði"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr "Tjaldstæði"
@@ -15386,10 +15422,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr "Breyti tjaldstæði"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "Matur & Drykkur"
@@ -15400,5 +15436,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Veitingastaður"
@@ -15406,5 +15442,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr "Breyti veitingastað"
@@ -15412,5 +15448,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr "Matargerð"
@@ -15418,61 +15454,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr "ítölsk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr "kínversk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr "grísk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr "þýsk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr "indversk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr "tyrknesk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr "asísk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr "tælensk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr "mexíkósk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr "japönsk"
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr "Skyndibiti"
@@ -15480,9 +15516,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr "Breyti skyndibitastað"
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr "Kaffihús"
@@ -15490,10 +15526,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr "Breyti kaffihúsi"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr "Bar"
@@ -15501,20 +15537,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr "Breyti bar"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr ""
@@ -15522,10 +15558,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr "Næturklúbbur"
@@ -15533,20 +15569,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr "Breyti næturklúbb"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "Ferðamennska"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr ""
@@ -15555,11 +15591,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr "Opnunartími"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "Safn"
@@ -15567,10 +15603,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr "Breyti safni"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "Dýragarður"
@@ -15579,10 +15615,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr "Breyti dýragarð"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr "Útsýnisstaður"
@@ -15590,25 +15626,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr "Breyti útsýnisstað"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr "Skemmtigarður"
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr "Breyti skemmtigarð"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr "Listaverk"
@@ -15616,5 +15652,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr "Breyti listaverki"
@@ -15622,5 +15658,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr "Upplýsingamiðstöð"
@@ -15628,80 +15664,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr "Breyti upplýsingamiðstöð"
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "Kort"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr "Gerð korts"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr "kort"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr "borgarkort"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr "göngukort"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr "hjólakort"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
 msgid "Closer Description"
 msgstr "Nánari lýsing"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1701
 msgid "Information Board"
 msgstr "Fræðsluskilti"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Board Type"
 msgstr "Viðfangsefni skiltisins"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "board"
 msgstr ""
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "history"
 msgstr "sagnfræði"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "nature"
 msgstr "náttúran"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "wildlife"
 msgstr "dýralíf"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Guidepost (Hiking)"
 msgstr ""
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr "Breyti skýli"
@@ -15709,25 +15745,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr "Eldstæði"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "Sögustaðir"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "Kastali"
@@ -15736,20 +15772,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr "Breyti kastala"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "Rústir"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr "Breyti rústum"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr "Fornleifasvæði"
@@ -15758,10 +15794,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr "Breyti fornleifasvæði"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr "Vígvöllur"
@@ -15769,5 +15805,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr "Breyti vígvelli"
@@ -15775,15 +15811,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr "Minnismerki"
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr "Breyti minnismerki"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr "Minnisvarði"
@@ -15791,45 +15827,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr "Breyti minnisvarða"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "Frístundir"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr "Vatnsleikjagarður"
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr "Breyti vatnsleikjagarð"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "Leikvöllur"
@@ -15837,15 +15873,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr "Breyti leikvöll"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "Fiskveiðar"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr "Breyti fiskveiðum"
@@ -15853,15 +15889,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr "Íþróttamannvirki"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "Íþróttaleikvangur"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr "Breyti íþróttaleikvang"
@@ -15875,6 +15911,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "veldu íþrótt:"
@@ -15897,4 +15933,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -15955,5 +15999,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -15963,5 +16015,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16107,5 +16159,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16211,5 +16263,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16250,29 +16302,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr "íþrótt"
@@ -16282,227 +16335,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr "bogfimi"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr "ástralskur fótbolti"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr "hafnabolti"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr "körfubolti"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr "klifur"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr "fótbolti"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr "hokkí"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr "skotfimi"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr "skautar"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr "skíði"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "fótbolti"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr "sund"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "borðtennis"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr ""
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr "Íþróttamiðstöð"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr "Breyti íþróttamiðstöð"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr "Völlur"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr "Breyti velli"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr "Golfvöllur"
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr "Breyti golfvelli"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr ""
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr "Íþróttir"
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr ""
@@ -16541,191 +16594,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr "völlur"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr "íþróttamiðstöð"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr "íþróttaleikvangur"
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr "Bogfimi"
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr "Breyti bogfimi"
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr "Klifur"
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr "Breyti klifri"
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr ""
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr "Skautar"
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr "Breyti skautum"
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr "Sund"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr "Breyti sundi"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr "Skíði"
@@ -16733,56 +16786,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr "Breyti skíðasvæði"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr "Skotfimi"
@@ -16790,178 +16843,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr "Breyti skotfimi"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr "Boltaíþróttir"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr "Fótbolti"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr "Breyti fótbolta"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr "Amerískur fótbolti"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr "Breyti Amerískum fótbolta"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr "Ástralskur fótbolti"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr "Breyti Áströlskum fótbolta"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr "Hafnabolti"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr "Breyti hafnabolta"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr "Körfubolti"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr "Breyti körfubolta"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr "Hokkí"
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr "Breyti hokkí"
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr "Borðtennis"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr "Breyti borðtennis"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr "Breyti tennis"
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "Byggingar"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr "Bygging"
@@ -16969,5 +17022,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "Opinber bygging"
@@ -16975,10 +17028,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr "Breyti opinberri byggingu"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "Ráðhús"
@@ -16986,10 +17039,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "Breyti ráðhúsi"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "Sendiráð"
@@ -16997,10 +17050,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "Breyti sendiráði"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "Dómshús"
@@ -17009,10 +17062,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "Breyti dómshúsi"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "Fangelsi"
@@ -17021,10 +17074,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "Breyti fangelsi"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "Lögreglustöð"
@@ -17034,10 +17087,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "Breyti lögreglustöð"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "Slökkvistöð"
@@ -17046,10 +17099,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "Breyti slökkvistöð"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "Pósthús"
@@ -17057,5 +17110,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr "Breyti pósthúsi"
@@ -17063,15 +17116,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr "Leikskóli"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr "Breyti leikskóla"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "Skóli"
@@ -17079,10 +17132,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "Breyti skóla"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr "Háskóli"
@@ -17090,10 +17143,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr "Breyti háskóla"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr "Menntaskóli"
@@ -17101,5 +17154,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr "Breyti menntaskóla"
@@ -17107,5 +17160,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "Kvikmyndahús"
@@ -17114,10 +17167,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "Breyti kvikmyndahúsi"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "Bókasafn"
@@ -17126,10 +17179,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "Breyti bókasafni"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr "Listamiðstöð"
@@ -17137,10 +17190,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr "Breyti listamiðstöð"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "Leikhús"
@@ -17149,10 +17202,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "Breyti leikhúsi"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr "Helgistaður"
@@ -17162,5 +17215,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr "Breyti helgistað"
@@ -17169,6 +17222,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr ""
@@ -17177,66 +17230,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr ""
@@ -17245,81 +17298,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr "Heimilisfang"
@@ -17328,5 +17381,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr "Breyti heimilisfangi"
@@ -17334,5 +17387,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr "Húsnúmer"
@@ -17340,20 +17393,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr "Nafn húss"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr "Nafn bæjar"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "Póstnúmer"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr "Landskóði"
@@ -17361,5 +17414,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr ""
@@ -17368,5 +17421,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -17374,71 +17427,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr ""
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr "Mannvirki"
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "Turn"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "Breyti turni"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "Vatnsturn"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "Breyti vatnsturni"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "Viti"
@@ -17446,10 +17499,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "Breyti vita"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "Vindmylla"
@@ -17457,10 +17510,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "Breyti vindmyllu"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "Leiðsla"
@@ -17468,10 +17521,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "Breyti leiðslu"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr ""
@@ -17481,10 +17534,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr "Krani"
@@ -17492,10 +17545,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr "Breyti krana"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr ""
@@ -17503,10 +17556,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr ""
@@ -17514,10 +17567,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr "Eftirlitsmyndavél"
@@ -17525,5 +17578,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr "Breyti eftirlitsmyndavél"
@@ -17531,5 +17584,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr "Rafall"
@@ -17539,39 +17592,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr "Breyti rafli"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr "Orkuver"
@@ -17580,10 +17633,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr "Breyti orkuveri"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr "Spennustöð"
@@ -17592,5 +17645,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr "Breyti spennustöð"
@@ -17598,10 +17651,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr "Tilvísunarnúmer línunnar"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr "Háspennustaur"
@@ -17612,5 +17665,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr "Breyti háspennustaur"
@@ -17618,5 +17671,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr "Raflína"
@@ -17625,25 +17678,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr "Breyti raflínu"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr "Volt"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr "Fjöldi víra"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "Salerni"
@@ -17651,20 +17704,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr "Tilvísun"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr "Athugasemd"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr "Póstkassi"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "Almenningssími"
@@ -17673,5 +17726,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr "Breyti almenningssíma"
@@ -17679,5 +17732,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "Mynt"
@@ -17685,5 +17738,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr "Athugasemd"
@@ -17691,5 +17744,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -17697,5 +17750,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr "Debetkort"
@@ -17703,15 +17756,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "Símakort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr "Endurvinnsla"
@@ -17720,5 +17773,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr "Breyti endurvinnslustöð"
@@ -17726,35 +17779,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr "Rafhlöður"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr "Dósir"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr "Föt"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr "Gler"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr "Pappír"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr "Brotajárn"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr "Bekkur"
@@ -17763,20 +17816,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr ""
@@ -17784,22 +17837,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr "Hæð"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr "Gosbrunnur"
@@ -17808,10 +17861,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr "Breyti gosbrunn"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "Drykkjarvatn"
@@ -17820,10 +17873,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "Breyti drykkjarvatni"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr "Barnalúga"
@@ -17831,25 +17884,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr "Breyti barnalúgu"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "Verslanir"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr ""
@@ -17857,10 +17910,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr ""
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr "Sjoppa"
@@ -17868,10 +17921,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr "Breyti sjoppu"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "Sjálfsali"
@@ -17879,5 +17932,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr ""
@@ -17885,88 +17938,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "dagblöð"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "dót"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "Slátrari"
@@ -17974,10 +18027,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "Breyti slátrara"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "Bakarí"
@@ -17985,10 +18038,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "Breyti bakaríi"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr "Blómabúð"
@@ -17996,20 +18049,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr "Breyti blómabúð"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr "Lífræn búð"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr "Breyti lífrænni búð"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr ""
@@ -18017,60 +18070,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr ""
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr "Vínbúð"
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr ""
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr "Tölvubúð"
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr "Breyti tölvubúð"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr "Raftækjabúð"
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr "Breyti raftækjabúð"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr "Hljómtækjaverslun"
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr "Breyti hljómtækjaverslun"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr "Húsgagnaverslun"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr "Breyti húsgagnaverslun"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr ""
@@ -18078,10 +18131,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr ""
@@ -18089,10 +18142,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -18100,60 +18153,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr "Skrifstofuvörur"
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr "Breyti skrifstofuvörum"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr "Hársnyrtir"
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr "Breyti hársnyrti"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr "Skóbúð"
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr "Breyti skóbúð"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr "Dótabúð"
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr "Breyti dótabúð"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "Efnalaug"
@@ -18161,10 +18214,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "Breyti efnalaug"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "Þvottahús"
@@ -18172,10 +18225,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "Breyti þvottahúsi"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr "Útivistarbúð"
@@ -18183,35 +18236,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr "Breyti útivistarbúð"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr ""
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr "Breyti sjóntækjasmið"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "Fjármál"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "Banki"
@@ -18219,5 +18272,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "Breyti banka"
@@ -18225,10 +18278,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "Hraðbanki"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr "Gjaldeyrisskipti"
@@ -18236,5 +18289,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr "Breyti gjaldeyrisskiptum"
@@ -18242,15 +18295,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "Breyti hraðbanka"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "Heilsa"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr "Læknir"
@@ -18258,20 +18311,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr "Breyti lækni"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr "Tannlæknir"
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr "Breyti tannlækni"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "Apótek"
@@ -18279,5 +18332,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "Apótek"
@@ -18285,10 +18338,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "Spítali"
@@ -18296,10 +18349,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "Breyti spítala"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr ""
@@ -18308,5 +18361,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -18315,20 +18368,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -18336,5 +18389,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr "Dýralæknir"
@@ -18343,56 +18396,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr "Breyti dýralækni"
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr "Heimsálfa"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr "Breyti heimsálfu"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr "Breyti landi"
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr "Fylki"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr "Breyti fylki"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr "Svæði"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr "Breyti svæði"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr "Sýsla"
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr "Breyti sýslu"
@@ -18400,15 +18452,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr "Borg"
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr "Breyti borg"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr "Bær"
@@ -18416,10 +18468,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr "Breyti bæ"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr "Hverfi"
@@ -18427,25 +18479,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr "Breyti hverfi"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "Þorp"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "Breyti þorpi"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr "Smáþorp"
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr "Breyti smáþorpi"
@@ -18453,5 +18505,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr ""
@@ -18459,10 +18511,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "Eyja"
@@ -18470,5 +18522,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "Breyti eyju"
@@ -18476,5 +18528,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr "Hellismunni"
@@ -18482,10 +18534,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr "Breyti hellismunna"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "Tindur"
@@ -18493,10 +18545,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "Breyti tind"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr "Jökull"
@@ -18504,10 +18556,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr "Breyti jökli"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr "Eldfjall"
@@ -18515,70 +18567,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr "Breyti eldfjalli"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr ""
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr "Breyti landamærum þjóðgarðs"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr "Landnýting"
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "Tré"
@@ -18587,15 +18639,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "Breyti tré"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr "Fræðiheiti"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr "Skógur"
@@ -18604,5 +18656,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr "Breyti skóg"
@@ -18610,17 +18662,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr "barrskógur"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr "laufskógur"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr "blandaður"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "Skógur (ræktaður)"
@@ -18629,14 +18681,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr "Breyti ræktuðum skóg"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -18644,25 +18696,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr ""
@@ -18670,10 +18722,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr ""
@@ -18681,5 +18733,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr ""
@@ -18687,5 +18739,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr ""
@@ -18694,45 +18746,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -18740,25 +18792,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr "Garður"
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr "Breyti garði"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr ""
@@ -18766,10 +18818,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr ""
@@ -18777,20 +18829,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr "Almenningsgarður"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr "Breyti almenningsgarð"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr ""
@@ -18798,5 +18850,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -18804,15 +18856,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr "Íbúðarsvæði"
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr "Breyti íbúðarlandnýtingu"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr "Grafreitur"
@@ -18820,9 +18872,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr "Breyti grafreit"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr ""
@@ -18830,39 +18882,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr "Breyti kirkjugarðslandnýtingu"
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr "Smásala"
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr "Breyti smásölulandnýtingu"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr "Skrifstofur"
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr "Breyti skrifstofulandnýtingu"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr "Iðnaður"
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr "Breyti iðnaðarlandnýtingu"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr ""
@@ -18870,15 +18922,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr ""
@@ -18886,55 +18938,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr "Byggingarsvæði"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr "Breyti byggingarsvæðislandnýtingu"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr ""
@@ -18944,5 +18996,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr ""
@@ -18951,10 +19003,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr ""
@@ -18962,5 +19014,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr ""
@@ -18969,5 +19021,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -18975,34 +19027,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr "aðeins_beint_fram"
@@ -19011,15 +19063,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr "af vegi"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr "gegnum hnút eða veg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr "að vegi"
@@ -19027,5 +19079,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr ""
@@ -19034,5 +19086,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr ""
@@ -19040,5 +19092,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr ""
@@ -19110,24 +19162,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr "hjól"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr ""
@@ -19180,20 +19232,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr "fótgangandi"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr ""
@@ -19207,10 +19259,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr ""
@@ -19218,26 +19270,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr ""
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+msgid "Route state"
+msgstr ""
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr ""
@@ -19246,30 +19303,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr ""
@@ -19305,6 +19362,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19320,5 +19378,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19337,5 +19403,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr ""
@@ -19429,7 +19495,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr "brú"
@@ -19694,15 +19760,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr ""
@@ -19744,5 +19810,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr ""
@@ -19880,4 +19946,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19889,5 +19961,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19895,5 +19967,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19930,5 +20002,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19952,11 +20024,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr ""
@@ -19980,5 +20052,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20019,5 +20091,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20055,6 +20127,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr "stræti"
@@ -20110,7 +20182,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr ""
@@ -20163,11 +20235,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr ""
@@ -20188,5 +20268,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr ""
@@ -20200,5 +20280,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr ""
@@ -20219,5 +20299,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr "beygjuhringur"
@@ -20231,6 +20311,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr ""
@@ -20245,5 +20325,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr "árbakki"
@@ -20257,5 +20337,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr "lækur"
@@ -20269,5 +20349,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr ""
@@ -20295,5 +20375,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr ""
@@ -20436,5 +20516,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20461,13 +20541,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr ""
@@ -20529,7 +20609,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr ""
@@ -20552,10 +20632,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr ""
@@ -20591,7 +20671,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr ""
@@ -20636,6 +20716,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr ""
@@ -20649,5 +20729,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr ""
@@ -20669,5 +20749,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr ""
@@ -20681,5 +20761,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr ""
@@ -20687,4 +20767,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20727,7 +20814,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr "skíðalyfta"
@@ -20744,5 +20831,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr ""
@@ -20757,5 +20844,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr ""
@@ -20770,5 +20857,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr ""
@@ -20783,5 +20870,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr ""
@@ -20796,5 +20883,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr ""
@@ -20809,5 +20896,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr ""
@@ -20830,4 +20917,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -20838,4 +20932,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -20912,10 +21014,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr ""
@@ -20929,5 +21032,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr "bryggja"
@@ -20941,5 +21044,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr "leiðsla"
@@ -21067,12 +21170,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr "frístundir"
@@ -21086,5 +21189,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr "smábátahöfn"
@@ -21156,8 +21259,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr ""
@@ -21259,10 +21362,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr ""
@@ -21282,4 +21385,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21301,4 +21411,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21622,4 +21739,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -21646,24 +21771,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr ""
@@ -21695,6 +21828,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr ""
@@ -21755,8 +21888,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr ""
@@ -22109,26 +22242,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr ""
@@ -22183,5 +22316,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22200,8 +22333,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr "hótel"
@@ -22351,9 +22484,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr "ferðamennska"
@@ -22425,8 +22558,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr ""
@@ -22497,8 +22630,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr ""
@@ -22512,5 +22645,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr ""
@@ -22524,5 +22657,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr ""
@@ -22544,5 +22677,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr ""
@@ -22556,5 +22689,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr "skógur (ræktaður)"
@@ -22568,5 +22701,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr ""
@@ -22589,5 +22722,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr "smásala"
@@ -22601,5 +22734,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr "iðnaður"
@@ -22613,5 +22746,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr ""
@@ -22625,5 +22758,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr ""
@@ -22637,5 +22770,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr ""
@@ -22692,7 +22825,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr ""
@@ -22706,5 +22839,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr ""
@@ -22717,5 +22850,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr "tindur"
@@ -22730,5 +22863,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr "jökul"
@@ -22742,5 +22875,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr "eldfjall"
@@ -22795,8 +22928,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr ""
@@ -22810,5 +22943,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr ""
@@ -22822,5 +22955,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr ""
@@ -22834,5 +22967,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr "skógur"
@@ -22846,5 +22979,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr "leðja"
@@ -22858,5 +22991,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr "strönd"
@@ -22934,8 +23067,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr ""
@@ -22983,7 +23116,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr ""
@@ -23125,10 +23258,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr ""
@@ -23176,6 +23309,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr ""
@@ -23472,7 +23605,4 @@
 msgstr ""
 
-#~ msgid "Unknown file extension."
-#~ msgstr "Óþekkt skráarending"
-
 #~ msgid "Aborting..."
 #~ msgstr "Hætti við..."
@@ -23491,4 +23621,7 @@
 #~ msgstr[0] "{0} viðbót var uppfærð. Vinsamlegast endurræstu JOSM."
 #~ msgstr[1] "{0} viðbætur voru uppfærðar. Vinsamlegast endurræstu JOSM."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Óþekkt skráarending"
 
 #~ msgid "Could not download plugin: {0} from {1}"
Index: /applications/editors/josm/i18n/po/it.po
===================================================================
--- /applications/editors/josm/i18n/po/it.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/it.po	(revision 17069)
@@ -5,6 +5,6 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
-"PO-Revision-Date: 2009-08-05 08:40+0000\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
+"PO-Revision-Date: 2009-08-10 13:15+0000\n"
 "Last-Translator: Davide Prade <davalv@alice.it>\n"
 "Language-Team: Italian <talk-it@lists.openstreetmap.org>\n"
@@ -13,5 +13,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-10 11:57+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -54,6 +54,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -63,5 +63,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -98,6 +98,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "Errore"
@@ -110,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "Modifiche non salvate"
@@ -129,10 +129,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -149,15 +149,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -187,6 +187,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -216,5 +216,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -375,5 +375,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
 msgstr "Unisci"
@@ -458,9 +458,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -493,7 +493,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -582,37 +582,37 @@
 "permesso {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "dati"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "layer"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "selezione"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "conflitto"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "scarica"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zoom a {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Fa lo zoom della vista a {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -622,30 +622,30 @@
 msgstr "Visualizza: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "Nessuna selezione da ingrandire"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "Nessun conflitto da ingrandire"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "Unisci percorso"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "Unisce diversi percorsi in uno."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "Selezionare almeno due percorsi da unire."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr "Unire i percorsi con diverse appartenenze?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -655,13 +655,13 @@
 "unirli?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "Unisci comunque"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "Inverti direzione?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -671,10 +671,10 @@
 "la direzione di qualcuno?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "Inverti direzione e unisci"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -682,20 +682,20 @@
 msgstr "Inserire dei valori per tutti i conflitti."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Risolvi conflitti"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Unisci {0} percorsi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "Tutti i percorsi erano vuoti"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -744,6 +744,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -765,6 +765,6 @@
 msgstr "Cancella gli oggetti selezionati."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -774,5 +774,5 @@
 msgstr "Sovrascrivi"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -906,7 +906,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "Esporta i dati in un file GPX."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -922,5 +921,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -938,5 +937,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -1013,22 +1012,22 @@
 msgstr "Unisci il livello corrente con un altro livello"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "Fondi nodi"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "Unisci i nuovi nodi in quello più vecchio."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "Seleziona almeno due nodi da unire."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr "Unire i nodi con diffenti appartenenze?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1037,13 +1036,13 @@
 "I nodi selezionati appartengono a relazioni differenti. Vuoi comunque unirli?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "Incorpora comunque"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "Impossibile unire i nodi. Cancellare un percorso attualmente usato."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1299,9 +1298,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
 msgstr ""
-"Non è stata trovata alcuna intersezione. Non è stata apportata alcuna "
-"modifica."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1921,5 +1917,5 @@
 msgstr "Errori durante lo scaricamento"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1931,5 +1927,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr "Primitive eliminate o spostate"
@@ -1969,11 +1965,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2120,5 +2116,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2200,5 +2196,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Cerca degli oggetti."
@@ -2336,5 +2332,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Cerca"
@@ -2542,5 +2538,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2585,5 +2581,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr "Elimina dalla relazione"
@@ -2625,9 +2621,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "Unisci {0} nodi"
-msgstr[1] "Unisci {0} nodi"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2663,9 +2659,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "Ruota {0} {1}"
-msgstr[1] "Ruota {0} {1}"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2832,7 +2828,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "Cambiare {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2842,5 +2838,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2887,5 +2883,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2918,5 +2914,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2930,5 +2926,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "ferrovia"
@@ -2943,5 +2939,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3225,5 +3221,5 @@
 msgstr "Non mostrare di nuovo"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3236,5 +3232,5 @@
 "propria connessione ad internet."
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3246,10 +3242,10 @@
 "usato<br>viola una precondizione.<br>Il messaggio di errore é:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr "Violazione della precondizione"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3257,25 +3253,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3285,9 +3281,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3296,9 +3292,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "Eccezione inattesa"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3308,9 +3316,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "Host sconosciuto"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3323,5 +3331,5 @@
 "messaggio di errore è:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr "Primitiva già eliminata"
@@ -3411,10 +3419,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "Nome utente"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "Password"
@@ -3621,15 +3629,15 @@
 msgstr "(nessun oggetto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "livello non in lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3684,5 +3692,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr "Il mio con il loro"
@@ -3691,5 +3699,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr "Il mio con l'unione"
@@ -3698,20 +3706,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr "Il loro con l'unione"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr "il ruolo {0} non partecipa nella comparazione {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3721,6 +3729,6 @@
 msgstr "Etichette"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3728,6 +3736,6 @@
 msgstr "Nodi"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3735,23 +3743,23 @@
 msgstr "Membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr "Non c'è alcun conflitto di etichette in attesa di risoluzione"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "Etichette({0} conflitti)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr "{0} conflitti di etichette in attesa di risoluzione"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr "Nodi(risolti)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
@@ -3760,17 +3768,17 @@
 "alcun conflitto in attesa"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "Nodi(con conflitti)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr "Conflitti in attesa nella lista di nodi di questo percorso"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "Membri(risolti)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3780,64 +3788,64 @@
 "non c'è alcun conflitto in attesa"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "Membri(con conflitti)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr "Conflitti in attesa nella lista di membri di questa relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr "Non c'è alcun conflitto di proprietà in attesa"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "Proprietà(con conflitti)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr "Conflitti di proprietà in attesa di essere risolti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "Risoluzione conflitto"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr "parametro attualmente fuori scala: ottenuto {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr "la lista nel ruolo {0} attualmente non partecipa ad alcun confronto"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr "valore inaspettato per il parametro \"index\". Ottenuto {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr "elemento {0} non trovato nella lista"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr "blocca scorrimento"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr "Confronta "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr "Versione personale"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr ""
@@ -3845,11 +3853,11 @@
 "locale"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr "Versione unita"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3859,10 +3867,10 @@
 "appena saranno applicate le decisioni sull'unione."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr "La loro versione"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr ""
@@ -3870,22 +3878,22 @@
 "server"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr "> inizio"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr "Copia i miei nodi selezionati all'inizio della lista dei nodi uniti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr "> fine"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr ""
 "Copia i miei elementi selezionati alla fine della lista degli elementi uniti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3895,5 +3903,5 @@
 "lista degli elementi uniti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3903,5 +3911,5 @@
 "lista degli elementi uniti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
@@ -3909,10 +3917,10 @@
 "uniti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 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"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3922,5 +3930,5 @@
 "lista degli elementi uniti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3930,21 +3938,21 @@
 "lista degli elementi uniti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr "Su"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr "Sposta in su gli elementi selezionati di una posizione"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr "Giù"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr "Sposta in giù le voci selezionate di una posizione"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3953,27 +3961,27 @@
 msgstr "Elimina"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr "Elimina le voci selezionate dalla lista degli elementi uniti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr "Blocca"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr "Blocca la lista attuale degli elementi uniti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr "Sblocca"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr "Sblocca la lista degli elementi uniti ed inizia l'unione"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3983,5 +3991,5 @@
 "personali e le loro</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3992,5 +4000,5 @@
 "personali e le loro</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3999,5 +4007,5 @@
 msgstr[1] "Versione personale ({0} voci)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -4006,5 +4014,5 @@
 msgstr[1] "Versione unita ({0} voci)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -4013,21 +4021,21 @@
 msgstr[1] "Loro versione ({0} voci)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -4037,5 +4045,5 @@
 msgstr "il parametro '{0}' non deve essere nullo"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -4047,5 +4055,5 @@
 "partecipazione nella regolazione sincronizzata"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -4053,9 +4061,9 @@
 msgstr "adjustable {0} non ancora registrato"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr "Nodo"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4064,10 +4072,10 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr "indice di colonna non atteso. Ottenuto {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -4078,19 +4086,19 @@
 "server<br>Dettagli: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr "Comunicazione con il server fallita"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr "Si, ripristina anche questo"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr "No, annulla l'operazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -4101,9 +4109,9 @@
 "cancellati sul server.<br><br>Vuoi recuperare anche questi nodi?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr "Ripristina i nodi addizionali?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -4113,14 +4121,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr "Ripristina le primitive dipendenti?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr ""
 "Proprietà nell'insieme di dati personale, cioè l'insieme di dati locale"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -4128,90 +4136,90 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr "Proprietà nel loro insieme di dati, cioè l'insieme di dati del server"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr "Coordinate:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr "Stato eliminato:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr "Stato visibile:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr "(nessuno/a)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "cancellato"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr "non eliminato"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr "visibile (sul server)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr "non visibile (sul server)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr "Mantieni un clone della versione locale"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr "Elimina fisicamente dall'insieme di dati locale"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr "Mantieni le mie coordinate"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr "Mantieni le loro coordinate"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr "Marca come irrisolto il conflitto tra coordinate differenti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr "Mantieni il mio stato eliminato"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr "Mantieni il loro stato eliminato"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr "Marca come irrisolto il conflitto tra stati eliminati"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr "Mantieni il mio stato visibile"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr "Si, reimposta l'id"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr "No, annulla"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4224,17 +4232,17 @@
 "assegnerà ad esso<br>un nuovo identificativo.<br>Si è d'accordo?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr "Reimposta l'id a 0"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr "Mantieni il loro stato visibile"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr "Si, elimina"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4245,14 +4253,14 @@
 "<br>dall'insieme di dati.<br>Si è d'accordo?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr "Elimina dall'insieme di dati"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4260,10 +4268,10 @@
 msgstr "Ruolo"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr "Primitiva"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4271,12 +4279,12 @@
 "risoluzione"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4284,8 +4292,8 @@
 msgstr "<indefinito>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
@@ -4293,6 +4301,6 @@
 "L'unione dell'insieme dei dati non includerà una etichetta con la chiave {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4301,7 +4309,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4313,7 +4321,7 @@
 msgstr "Chiave"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4326,47 +4334,47 @@
 msgstr "Valore"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr "non è possibile marcare come irrisolto l'elemento oggetto di unione"
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr "Il parametro 'col' deve essere 0 o 1. Ottenuto {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr "Versione personale (insieme di dati locale)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr "Loro versione (insieme dei dati del server)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ">"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 "Mantieni la coppia chiave/valore selezionata dall'insieme di dati locale"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr ""
 "Mantieni la coppia chiave/valore selezionata dall'insieme di dati del server"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr "Irrisolto"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr "Marca le etichette selezionate come irrisolte"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4387,8 +4395,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4427,5 +4435,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4529,83 +4537,83 @@
 msgstr "Visualizza lo storico della primitiva selezionata"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "Livelli"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "Apre la lista di tutti i livello caricati."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "Cancella il livello selezionato."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr "Elimina livello"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "Mostra/Nascondi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "Inverte la visibilità del livello selezionato."
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "Sposta il livello selezionato in su."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "Sposta il layer selezionato in giù."
@@ -4615,6 +4623,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4623,22 +4631,22 @@
 msgstr[1] "Questo cambierà {0} oggetti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "Un valore vuoto cancella la chiave."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<diverso>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "Cambiare i valori?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4646,5 +4654,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4653,40 +4661,40 @@
 msgstr[1] "Cambia le proprietà di al massimo {0} oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "Seleziona una chiave"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "Seleziona un valore"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 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/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "Proprietà/Appartenenze"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "Proprietà per gli oggetti selezionati."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "Membro di"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "Aggiungi proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4703,39 +4711,39 @@
 msgstr "Aggiungi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 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/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "Modifica proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 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/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Proprietà: {0} / Appartenenze: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "Proprietà / Appartenenze"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "Cambia relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, 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/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "Cancella la chiave selezionata in tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "Elimina proprietà"
@@ -4747,5 +4755,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "Relazioni"
@@ -4777,31 +4785,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "Selezione corrente"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "Apri una finestra con la lista delle selezioni."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "Fai lo zoom sugli elementi selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "Ricarica la lista di selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "Zoom sulla selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Sel.: Rel.:{0}/Percorsi:{1}/Nodi:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4809,5 +4817,5 @@
 msgstr "Selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4816,5 +4824,5 @@
 msgstr[1] "{0} percorsi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4823,5 +4831,5 @@
 msgstr[1] "{0} relazioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5035,7 +5043,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "Cancella le relazioni selezionate"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -5118,5 +5125,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5359,5 +5366,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "Luoghi"
@@ -5404,21 +5411,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "tipo"
@@ -6220,72 +6227,520 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "Nome"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+"<html>Versione <strong>{0}</strong> creata il <strong>{1}</strong> da "
+"<strong>{2}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr "Versione {0} creata il {1} da {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr "Versione"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr "Immagini per {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr "Leggi GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Informazioni di tempo non disponibili per il punto {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Impossibile leggere il tempo \"{0}\" per il punto {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr "Non è stata trovata nessuna immagine con una data leggibile."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "Lettura di {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr "Immagini geoetichettate"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS inizio: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS fine: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr "differenza attuale: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr "differenza fuso orario: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "immagine"
+msgstr[1] "immagini"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} in questa traccia."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "Sincronizza tempo"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "Immagini JPEG (*.jpeg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Impossibile leggere la data nel file \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Orario non presente nei dati EXIF del file \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "Immagine"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Inserisci la data visualizzata (mm/gg/aaaa HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr "Fuso orario del GPS (differenza rispetto alle foto)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr "Sincronizza l'orario con l'unità GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr "Impossibile decodificare l'orario inserito."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr "punto GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "Personalizza disegno linee"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr "Usa le impostazioni globali."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr "Disegna le linee tra i punti di questo livello."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr "Non disegnare le linee tra i punti di questo livello."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr "Seleziona le opzioni per il disegno delle linee"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "Personalizza colori"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Predefinito"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Scegli un colore"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr "Crea marcatori dai punti con nome"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Nomina i punti del percorso da {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "Importa l'audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr "Files audio Wave (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Marcatori audio da {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "Importa immagini"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} percorso, "
+msgstr[1] "{0} percorsi, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} percorso, "
+msgstr[1] "{0} percorsi, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} punto del percorso"
+msgstr[1] "{0} punti del percorso"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr "Nome: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr "Descrizione: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr "Timespan/Arco di tempo: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr "Lunghezza: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "Converti in livello dati"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+msgid ""
+"<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 come dati di mappa è "
+"considerato dannoso.<br>Se si desidera caricare delle tracce, vedere qui:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Convertito da: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr "Scarica da OSM lungo questo tracciato"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr "Scarica tutto entro:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr "{0} metri"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr "Area massima per richiesta:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km quadrati"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Questa azione richiederà {0} richieste di scarico distinte.<br>Si "
+"vuole procedere?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr "Nessuna traccia GPX da associare con l'audio."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"Alcuni punti del percorso con marcature temporali precedenti l'inizio o "
+"successivi alla fine del tracciato sono stati omessi o posizionati "
+"all'inizio."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Sono stati esclusi alcuni punti del percorso che sono troppo lontani dal "
+"tracciato per poter essere giustamente calcolati."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Livello dati {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr "al di fuori dell'area scaricata"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr "versione {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+"Attenzione: l'uso contemporaneo di dati nelle versioni 0.5 e 0.6 risulterà "
+"nella versione 0.5"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} è composto da:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} eliminati)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr "disattiva"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr "Versione delle API: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr "Converti in un layer GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6294,7 +6749,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6304,453 +6759,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "Nome"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-"<html>Versione <strong>{0}</strong> creata il <strong>{1}</strong> da "
-"<strong>{2}</strong></html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr "Versione {0} creata il {1} da {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr "Versione"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr "Immagini per {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr "Leggi GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Informazioni di tempo non disponibili per il punto {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Impossibile leggere il tempo \"{0}\" per il punto {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr "Non è stata trovata nessuna immagine con una data leggibile."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Lettura di {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr "Immagini geoetichettate"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS inizio: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS fine: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr "differenza attuale: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr "differenza fuso orario: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "immagine"
-msgstr[1] "immagini"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} in questa traccia."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "Sincronizza tempo"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "Immagini JPEG (*.jpeg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Impossibile leggere la data nel file \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Orario non presente nei dati EXIF del file \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "Immagine"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Inserisci la data visualizzata (mm/gg/aaaa HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr "Fuso orario del GPS (differenza rispetto alle foto)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr "Sincronizza l'orario con l'unità GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr "Impossibile decodificare l'orario inserito."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr "punto GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "Personalizza disegno linee"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "Usa le impostazioni globali."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr "Disegna le linee tra i punti di questo livello."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr "Non disegnare le linee tra i punti di questo livello."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr "Seleziona le opzioni per il disegno delle linee"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "Personalizza colori"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Predefinito"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Scegli un colore"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr "Crea marcatori dai punti con nome"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Nomina i punti del percorso da {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "Importa l'audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr "Files audio Wave (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Marcatori audio da {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "Importa immagini"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} percorso, "
-msgstr[1] "{0} percorsi, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} percorso, "
-msgstr[1] "{0} percorsi, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} punto del percorso"
-msgstr[1] "{0} punti del percorso"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr "Nome: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr "Descrizione: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr "Timespan/Arco di tempo: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr "Lunghezza: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "Converti in livello dati"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-msgid ""
-"<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 come dati di mappa è "
-"considerato dannoso.<br>Se si desidera caricare delle tracce, vedere qui:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Convertito da: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr "Scarica da OSM lungo questo tracciato"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr "Scarica tutto entro:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr "{0} metri"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr "Area massima per richiesta:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km quadrati"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Questa azione richiederà {0} richieste di scarico distinte.<br>Si "
-"vuole procedere?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr "Nessuna traccia GPX da associare con l'audio."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-"Alcuni punti del percorso con marcature temporali precedenti l'inizio o "
-"successivi alla fine del tracciato sono stati omessi o posizionati "
-"all'inizio."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Sono stati esclusi alcuni punti del percorso che sono troppo lontani dal "
-"tracciato per poter essere giustamente calcolati."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Livello dati {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr "al di fuori dell'area scaricata"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr "versione {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-"Attenzione: l'uso contemporaneo di dati nelle versioni 0.5 e 0.6 risulterà "
-"nella versione 0.5"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} è composto da:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} eliminati)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr "disattiva"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr "Versione delle API: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr "Converti in un layer GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -7150,5 +7157,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "Automobile"
@@ -7165,16 +7172,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "Bicicletta"
@@ -7202,14 +7211,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "Pedone"
@@ -7439,19 +7451,19 @@
 msgstr "Lingua"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr "Abilitato 'built-in' predefinito"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr "Stili di disegno della mappa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr "Stile usato"
@@ -7584,40 +7596,11 @@
 msgstr "Password del server proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr "L'URL di base per il server OSM (API REST)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr "Nome di accesso (e-mail) al profilo OSM."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Password per l'account di OSM. Lasciare vuoto per non memorizzare la "
-"password."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "URL di base per il server"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr "Nome utente OSM (e-mail)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "Password OSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
-"<html>AVVISO: La password viene memorizzata in chiaro nel file di "
-"configurazione.<br>La password viene trasmessa in chiaro al server, encodata "
-"all'interno dell'URL.<br><b>Non usare una password di valore.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -7996,7 +7979,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "Impossibile leggere \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -8102,7 +8085,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "Ruolo ''{0}'' sconosciuto."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8268,23 +8251,52 @@
 msgstr "File bz2 non valido."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "Nome utente o password errati."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Attenzione: la password è trasferita non cifrata."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "Salva nome utente e password (non cifrata)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "Inserire la password"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
 msgstr "Login"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr "Nome di accesso (e-mail) al profilo OSM."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr ""
+"Password per l'account di OSM. Lasciare vuoto per non memorizzare la "
+"password."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr "Nome utente OSM (e-mail)"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "Password OSM"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
+"<html>AVVISO: La password viene memorizzata in chiaro nel file di "
+"configurazione.<br>La password viene trasmessa in chiaro al server, encodata "
+"all'interno dell'URL.<br><b>Non usare una password di valore.</b></html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -8464,14 +8476,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "Tipo di membro sconosciuto per ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "Preparazione dati OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr "Id del nodo malformato"
@@ -8947,5 +8959,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr "Descrizione"
@@ -9365,5 +9377,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr "Errore durante il caricamento del file"
@@ -9623,5 +9635,4 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
-#, fuzzy
 msgid ""
 "To enable the cadastre WMS plugin, change\n"
@@ -9629,6 +9640,4 @@
 "projection and retry"
 msgstr ""
-"Per abilitare l'estensione WMS del catasto, cambiare\n"
-"la proiezione di JOSM a Lambert e riavviare JOSM."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9721,5 +9730,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -10265,7 +10274,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr "acqua"
@@ -10453,7 +10462,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "nome"
+msgstr ""
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -11030,12 +11038,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "inizio"
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0} nodo"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11178,5 +11186,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr "Nome Strada"
@@ -12031,7 +12039,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr "building"
@@ -12045,5 +12053,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr "area"
@@ -12312,17 +12320,14 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "Scegli la riga da modificare."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "Salva livello WMS"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Start adjusting"
-msgstr "Inizia navigazione"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
@@ -12331,7 +12336,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "Nessun cambiamento da caricare."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -12344,9 +12348,9 @@
 "Potrebbero essere presenti errori nelle coordinate."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr "Scaricamento automatico"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
@@ -12354,10 +12358,10 @@
 "Livello WMS ({0}), scaricamento automatico al livello di ingrandimento {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Livello WMS ({0}), scaricamento per il livello di ingrandimento {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -12366,42 +12370,42 @@
 "oppure cambia risoluzione"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr "Scarica i tasselli visibili"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr "Cambia risoluzione"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr "Ricarica tile sbagliati"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr "Salva il livello WMS su file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr "Salva livello WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr "Carica il livello WMS da file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr "Carica livello WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Versione del file WMS non supportata; trovata {0}, attesa {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr "Errore nel formato del file"
@@ -12794,4 +12798,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12828,5 +12834,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr "Strade"
@@ -12837,5 +12843,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Motorway"
@@ -12844,5 +12850,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr "Modifica Motorway"
@@ -12869,8 +12875,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr "Riferimento"
@@ -12911,21 +12917,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr "Layer"
@@ -12939,8 +12945,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr "Corsie"
@@ -12958,15 +12964,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr "Velocità massima (km/h)"
@@ -13003,16 +13009,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr "Senso unico"
@@ -13054,19 +13060,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Ponte"
@@ -13102,19 +13108,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr "Galleria/tunnel"
@@ -13148,18 +13154,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr "Sbancamento"
@@ -13193,18 +13199,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr "Terrapieno"
@@ -13212,5 +13218,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr "Motorway Link"
@@ -13219,5 +13225,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr "Modifica Motorway Link"
@@ -13225,5 +13231,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr "Trunk"
@@ -13232,5 +13238,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr "Modifica Trunk"
@@ -13240,6 +13246,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr "Superstrada"
@@ -13247,5 +13253,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr "Trunk Link"
@@ -13254,5 +13260,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr "Modifica Trunk Link"
@@ -13265,5 +13271,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Primary"
@@ -13272,5 +13278,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr "Modifica Primary"
@@ -13278,10 +13284,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr "Primary Link"
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr "Modifica Primary Link"
@@ -13293,5 +13299,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Secondary"
@@ -13301,5 +13307,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr "Modifica una Secondary"
@@ -13307,5 +13313,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr "Tertiary"
@@ -13315,5 +13321,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr "Modifica Tertiary"
@@ -13325,5 +13331,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Unclassified"
@@ -13333,5 +13339,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr "Modifica una strada unclassified"
@@ -13358,19 +13364,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr "Larghezza (metri)"
@@ -13382,5 +13388,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Residential"
@@ -13389,5 +13395,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr "Modifica Residential"
@@ -13411,13 +13417,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr "Superficie"
@@ -13437,20 +13443,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr "pavimentata"
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr "non pavimentata"
@@ -13458,12 +13464,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr "ciottoli (pavé)"
@@ -13471,5 +13477,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr "Living Street"
@@ -13478,5 +13484,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr "Modifica Living Street"
@@ -13484,5 +13490,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr "Service"
@@ -13491,5 +13497,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr "Modifica Serviceway"
@@ -13499,18 +13505,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr "Tipo di strada di servizio"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr "vicolo"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr "driveway"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr "corsia interna a parcheggio"
@@ -13518,5 +13524,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr "Corsia interna a parcheggio"
@@ -13526,5 +13532,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr "Modifica corsia interna a parcheggio"
@@ -13532,5 +13538,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr "Road (Tipo Sconosciuto)"
@@ -13539,5 +13545,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr "Modifica Road (Tipo Sconosciuto)"
@@ -13546,20 +13552,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr "Restrizioni e divieti"
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr "Modifica restrizioni e divieti"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr "Pedaggio"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr "Senza uscita (cul-de-sac)"
@@ -13572,8 +13578,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr "Permesso di accesso"
@@ -13617,23 +13623,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr "si"
@@ -13646,40 +13652,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr "privato"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr "specifico"
@@ -13692,19 +13698,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr "destinazione"
@@ -13727,65 +13733,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr "permesso"
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr "Agricolo"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr "no"
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr "Carico e scarico merci"
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Merci pesanti/Trasporti eccezionali"
@@ -13800,10 +13806,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr "Cavallo"
@@ -13819,13 +13825,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr "Motocicletta"
@@ -13841,30 +13847,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr "Automobile"
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr "Veicolo di servizio pubblico (psv)"
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr "Barca a motore"
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr "Barca"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr "Velocità minima (km/h)"
@@ -13872,25 +13878,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr "Peso massimo (tonnellate)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr "Altezza massima (metri)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr "Larghezza massima (metri)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr "Lunghezza massima (metri)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr "Rotatoria"
@@ -13901,5 +13907,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr "Modifica un incrocio"
@@ -13921,9 +13927,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr "Tipo"
@@ -13943,10 +13949,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr "motorway"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr "motorway_link"
@@ -13968,10 +13974,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr "trunk"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr "trunk_link"
@@ -13993,10 +13999,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr "primary"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr "primary_link"
@@ -14018,6 +14024,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr "secondary"
@@ -14031,9 +14037,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr "tertiary"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr "unclassified"
@@ -14047,9 +14053,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr "residential"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr "living_street"
@@ -14079,10 +14085,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr "service"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr "autobus_guidato"
@@ -14090,4 +14096,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -14105,6 +14118,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr "construction"
@@ -14115,10 +14128,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr "Modifica ponte"
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr "Modifica un Tunnel"
@@ -14126,19 +14139,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr "Percorsi"
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr "Construction"
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr "Modifica una strada in costruzione"
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr "Svincolo"
@@ -14154,5 +14167,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr "rotatoria"
@@ -14161,5 +14174,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr "Percorso per equitazione"
@@ -14167,5 +14180,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr "Modifica un percorso per equitazione"
@@ -14173,5 +14186,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr "Cycleway"
@@ -14181,5 +14194,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr "Modifica Cycleway"
@@ -14187,5 +14200,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr "Footway"
@@ -14194,5 +14207,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr "Modifica Footway"
@@ -14200,5 +14213,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr "Pedestrian"
@@ -14207,5 +14220,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr "Modifica Pedestrian"
@@ -14213,5 +14226,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr "Rampa di scale"
@@ -14221,5 +14234,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr "Modifica una rampa di scale"
@@ -14228,5 +14241,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr "Track"
@@ -14235,14 +14248,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr "Modifica Track"
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr "calcestruzzo"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr "ghiaia"
@@ -14250,18 +14263,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr "terra"
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr "erba"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr "sabbia"
@@ -14269,5 +14282,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr "Track Grade 1"
@@ -14276,5 +14289,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr "Modifica Track Grade 1"
@@ -14282,5 +14295,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr "Track Grade 2"
@@ -14289,5 +14302,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr "Modifica Track Grade 2"
@@ -14295,5 +14308,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr "Track Grade 3"
@@ -14302,5 +14315,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr "Modifica Track Grade 3"
@@ -14308,5 +14321,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr "Track Grade 4"
@@ -14315,5 +14328,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr "Modifica Track Grade 4"
@@ -14321,5 +14334,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr "Track Grade 5"
@@ -14328,5 +14341,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr "Modifica Track Grade 5"
@@ -14335,5 +14348,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr "Percorso"
@@ -14342,13 +14355,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr "Modifica percorso"
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr "Motoslitta"
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr "Sci"
@@ -14356,5 +14369,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr "Percorso escursionistico"
@@ -14364,5 +14377,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr "Modifica percorso escursionistico"
@@ -14370,5 +14383,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr "Percorso escursionistico montano"
@@ -14378,5 +14391,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr "Modifica percorso escursionistico montano"
@@ -14384,5 +14397,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr "Percorso escursionistico montano difficile"
@@ -14392,5 +14405,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Modifica percorso escursionistico montano difficile"
@@ -14398,5 +14411,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr "Percorso escursionistico alpino"
@@ -14406,5 +14419,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr "Modifica percorso escursionistico alpino"
@@ -14412,5 +14425,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr "Percorso escursionistico alpino difficile"
@@ -14420,5 +14433,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Modifica percorso escursionistico alpino difficile"
@@ -14426,5 +14439,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr "Percorso escursionistico alpino molto difficile"
@@ -14434,5 +14447,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Modifica un percorso escursionistico alpino molto difficile"
@@ -14440,10 +14453,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr "Punti del percorso"
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr "Motorway Junction"
@@ -14451,15 +14464,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr "Modifica Motorway Junction"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr "Numero"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr "Services"
@@ -14467,5 +14480,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr "Modifica Service Station"
@@ -14500,14 +14513,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr "Operatore"
@@ -14516,5 +14529,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr "Semaforo"
@@ -14524,5 +14537,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr "Tipo di attraversamento pedonale"
@@ -14531,27 +14544,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr "non presidiato"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr "Semaforo"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr "isola spartitraffico"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr "non marcato"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr "attraversamento a cavallo"
@@ -14559,6 +14572,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr "attraversamento ciclabile"
@@ -14567,11 +14580,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr "Attraversamento controllato"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr "Nome del tipo di attraversamento (UK)"
@@ -14579,30 +14592,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr "strisce pedonali"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr "attraversamento pedonale regolato da semaforo"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr "Stop"
@@ -14610,5 +14623,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr "Attraversamento pedonale"
@@ -14617,14 +14630,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr "Modifica attraversamento pedonale"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr "Nome del tipo (UK)"
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr "mini-rotatoria"
@@ -14635,14 +14648,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr "Direzione"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr "senso orario"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr "Slargo per inversione di marcia"
@@ -14652,20 +14665,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr "City Limit"
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr "Modifica City Limit"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr "Secondo nome"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr "Speed Camera"
@@ -14673,5 +14686,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr "Telefono di emergenza"
@@ -14679,5 +14692,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr "Rampa"
@@ -14685,5 +14698,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr "Rampa ripida"
@@ -14692,10 +14705,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr "Guado"
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr "Modifica guado"
@@ -14703,5 +14716,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr "Passo montano"
@@ -14709,5 +14722,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr "Modifica passo montano"
@@ -14719,7 +14732,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr "Elevazione"
@@ -14727,5 +14740,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr "Barriere"
@@ -14733,5 +14746,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr "Colonnina"
@@ -14739,5 +14752,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr "Modifica colonnina"
@@ -14776,18 +14789,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr "Traffico permesso:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr "Barriera per biciclette"
@@ -14796,5 +14813,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr "Blocco"
@@ -14802,5 +14819,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr "Griglia"
@@ -14808,10 +14825,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr "Modifica griglia"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr "Trappola bus"
@@ -14819,15 +14836,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr "Spunzoni"
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr "Modifica spunzoni"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr "Casello (per pedaggio)"
@@ -14835,5 +14852,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr "Modifica casello (per pedaggio)"
@@ -14841,10 +14858,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr "Dogana"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr "Modifica dogana"
@@ -14854,5 +14871,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr "Siepe"
@@ -14861,5 +14878,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr "Recinto"
@@ -14868,5 +14885,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr "Muro"
@@ -14874,5 +14891,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr "Cinta muraria"
@@ -14881,5 +14898,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr "Muro di contenimento"
@@ -14891,15 +14908,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr "Punto di accesso"
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr "Modifica punto di accesso"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr "Cancello"
@@ -14907,50 +14924,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr "Modifica cancello"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr "Cancello a sollevamento"
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr "Modifica cancello a sollevamento"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr "Cancello di filo spinato"
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr "Modifica cancello di filo spinato"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr "Bump Gate"
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr "Modifica un Bump Gate"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr "Kissing Gate"
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr "Modifica un Kissing Gate"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr "Stile"
@@ -14958,15 +14975,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr "Modifica scaletta"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+#, fuzzy
+msgid "Turnstile"
+msgstr "Piattaforma ferroviaria girevole"
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "Modifica scaletta"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr "Porta di cinta muraria"
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr "Modifica porta di cinta muraria"
@@ -14977,10 +15006,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr "Acqua"
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr "Sorgente"
@@ -14988,5 +15017,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr "Modifica sorgente"
@@ -14994,5 +15023,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr "Canale di scolo"
@@ -15000,10 +15029,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr "Modifica un canale di scolo"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr "Torrente"
@@ -15011,10 +15040,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr "Modifica un torrente"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr "Canale"
@@ -15022,10 +15051,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr "Modifica un canale"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr "Fiume"
@@ -15035,5 +15064,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr "Modifica un fiume"
@@ -15041,15 +15070,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr "Modifica acqua"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr "Terraferma"
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr "Modifica terraferma"
@@ -15057,15 +15086,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr "Bacino"
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr "Modifica area di bacino"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr "Serbatoio"
@@ -15073,15 +15102,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr "Modifica area di riserva d'acqua"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr "Bacino coperto"
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr "Modifica bacino coperto"
@@ -15089,5 +15118,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr "Argine"
@@ -15096,10 +15125,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr "Modifica un argine"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr "Zona umida"
@@ -15110,14 +15139,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr "Modifica zona umida"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr "palude"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr "torbiera"
@@ -15131,35 +15160,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr "palude alluvionale"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr "canneto"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr "palude salata"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr "barena"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr "mangrovie"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr "Zona fangosa (sabbie mobili)"
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr "Modifica zona fangosa (sabbie mobili)"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr "Spiaggia"
@@ -15167,20 +15196,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr "Modifica spiaggia"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr "Baia"
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr "Modifica baia"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr "Rupe"
@@ -15188,10 +15217,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr "Modifica Rupe"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr "Linea di costa"
@@ -15199,5 +15228,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr "Modifica linea di costa"
@@ -15205,5 +15234,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr "Linea traghetto"
@@ -15211,5 +15240,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr "Modifica una linea traghetto"
@@ -15218,5 +15247,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr "Cantiere navale"
@@ -15224,10 +15253,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr "Modifica cantiere navale"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr "Darsena/bacino navale"
@@ -15235,5 +15264,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr "Modifica una darsena/bacino navale"
@@ -15241,5 +15270,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr "Diga"
@@ -15247,15 +15276,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr "Modifica una diga"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr "Punto di corso d'acqua"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr "Chiusa (non blocca la navigazione)"
@@ -15264,5 +15293,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr "Sbarramento"
@@ -15270,20 +15299,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr "Modifica sbarramento"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr "Cascata"
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr "Modifica una cascata"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr "Punto di inversione di marcia"
@@ -15292,15 +15321,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr "Porto turistico"
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr "Modifica un porto turistico"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr "Passerella"
@@ -15308,10 +15337,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr "Modifica passerella"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr "Terminal traghetti"
@@ -15319,10 +15348,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr "Modifica terminal traghetti"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr "Rampa per la messa in acqua di imbarcazioni"
@@ -15332,5 +15361,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr "Modifica una rampa per la messa in acqua di imbarcazioni"
@@ -15338,10 +15367,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr "Ferrovia"
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr "Ferrovia"
@@ -15349,5 +15378,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr "Modifica una ferrovia"
@@ -15377,8 +15406,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr "Tipi opzionali"
@@ -15392,35 +15421,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr "tratto per lo smistamento delle merci"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr "tratto parallelo ad una ferrovia principale"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr "tratto per una società o ente"
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr "Ferrovia a scartamento ridotto"
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr "Modifica una ferrovia a scartamento ridotto"
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr "Monorotaia"
@@ -15428,45 +15457,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr "Modifica una monorotaia"
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr "Ferrovia storica"
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr "Modifica una ferrovia storica"
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr "Metropolitana di superficie"
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr "Modifica una metropolitana di superficie"
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr "Metropolitana"
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr "Modifica una metropolitana"
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr "Tramvia"
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr "Modifica una tramvia"
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr "Rotaie del bus"
@@ -15474,5 +15503,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr "Modificare le rotaie del bus"
@@ -15481,14 +15510,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr "Ferrovia in disuso"
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr "Modifica una ferrovia in disuso"
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr "Ferrovia abbandonata"
@@ -15497,5 +15526,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr "Passaggio a livello"
@@ -15504,5 +15533,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr "Crossing"
@@ -15512,5 +15541,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr "Tipo di attraversamento"
@@ -15518,5 +15547,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr "Piattaforma ferroviaria girevole"
@@ -15525,10 +15554,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr "Impianto di risalita"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr "Seggiovia"
@@ -15536,10 +15565,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr "Modifica una seggiovia"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr "Ski-lift"
@@ -15547,10 +15576,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr "Modifica uno ski-lift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr "Cabinovia"
@@ -15558,10 +15587,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr "Modifica una cabinovia"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr "Cabinovia"
@@ -15569,5 +15598,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr "Modifica cabinovia"
@@ -15575,5 +15604,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr "Stazione"
@@ -15584,10 +15613,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr "Modifica stazione"
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr "Stazione di rifornimento"
@@ -15597,5 +15626,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr "Modifica una stazione di rifornimento"
@@ -15611,5 +15640,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15619,5 +15648,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr "Modifica parcheggio"
@@ -15625,41 +15654,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr "Capacità"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr "superficie"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr "multi-piano"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr "sotterraneo"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr "parcheggio di interscambio"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr "Spazi per disabili"
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr "Tariffa"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr "Autolavaggio"
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr "Modifica autolavaggio"
@@ -15667,5 +15696,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr "Negozio"
@@ -15673,15 +15702,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr "Concessionaria"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr "Autofficina"
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr "Modifica autofficina"
@@ -15689,5 +15718,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr "Noleggio"
@@ -15696,10 +15725,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr "Modifica noleggio automobili"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr "Condivisione"
@@ -15707,5 +15736,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr "Modifica condivisione automobili"
@@ -15713,5 +15742,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr "Modifica parcheggio per biciclette"
@@ -15720,5 +15749,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr "Modifica noleggio biciclette"
@@ -15727,15 +15756,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr "Modifica negozio di biciclette"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "Trasporto pubblico"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr "Riferimento UIC"
@@ -15743,5 +15772,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr "Stazione ferroviaria non presidiata"
@@ -15749,5 +15778,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr "Modifica stazione non presidiata"
@@ -15755,5 +15784,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr "Fermata del tram"
@@ -15762,5 +15791,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr "Modifica fermata del tram"
@@ -15768,5 +15797,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr "Piattaforma ferroviaria"
@@ -15775,5 +15804,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr "Modifica una piattaforma ferroviaria"
@@ -15785,5 +15814,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr "Riferimento (numero del tracciato)"
@@ -15791,10 +15820,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr "Area"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr "Ingresso metropolitana"
@@ -15803,10 +15832,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr "Modifica ingresso metropolitana"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr "Sedia a rotelle"
@@ -15815,5 +15844,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr "Stazione degli autobus"
@@ -15822,5 +15851,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr "Modifica una stazione degli autobus"
@@ -15828,5 +15857,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr "Fermata dell'autobus"
@@ -15836,5 +15865,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr "Modifica fermata dell'autobus"
@@ -15845,6 +15874,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr "Pensilina/ricovero"
@@ -15852,10 +15881,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr "Piattaforma fermata bus"
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr "Modifica una piattaforma degli autobus"
@@ -15863,5 +15892,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr "Taxi"
@@ -15869,5 +15898,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr "Stazione dei taxi"
@@ -15875,5 +15904,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr "Aeroporto"
@@ -15881,15 +15910,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr "Modifica aeroporto"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr "ICAO"
@@ -15898,5 +15927,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr "Alloggiamento"
@@ -15908,5 +15937,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -15915,15 +15944,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr "Modifica hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr "Stelle"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr "Motel"
@@ -15931,20 +15960,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr "Modifica Motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr "Guest House"
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr "Modifica Guest House"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr "Casetta (chalet)"
@@ -15952,10 +15981,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr "Modifica casetta (chalet)"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr "Ostello"
@@ -15963,30 +15992,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr "Modifica ostello"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr "Rifugio alpino"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr "Modifica rifugio alpino"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr "Area caravan e camper"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr "Modifica area caravan e camper"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr "Campeggio"
@@ -15994,10 +16023,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr "Modifica campeggio"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "Cibo+bevande"
@@ -16008,5 +16037,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ristorante"
@@ -16014,5 +16043,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr "Modifica ristorante"
@@ -16020,5 +16049,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr "Cucina"
@@ -16026,61 +16055,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr "italiana"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr "cinese"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr "greca"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr "tedesca"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr "indiana"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr "regionale"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr "turca"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr "asiatica"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr "tailandese"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr "messicana"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr "giapponese"
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr "Fast food"
@@ -16088,9 +16117,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr "Modifica fast food"
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr "Caffetteria"
@@ -16098,10 +16127,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr "Caffetteria"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr "Pub"
@@ -16109,20 +16138,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr "Modifica Pub"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr "Modifica Biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr "Bar"
@@ -16130,10 +16159,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr "Modifica Bar"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr "Club notturno"
@@ -16141,20 +16170,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr "Modifica club notturno"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr "Attrazione turistica"
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr "Modifica attrazione turistica"
@@ -16163,11 +16192,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr "Orario di apertura"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "Museo"
@@ -16175,10 +16204,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr "Modifica museo"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "Zoo"
@@ -16187,10 +16216,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr "Modifica zoo"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr "Punto panoramico"
@@ -16198,25 +16227,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr "Modifica punto panoramico"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr "Torre di avvistamento"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr "Parco divertimenti"
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr "Modifica parco divertimenti"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr "Opera d'arte"
@@ -16224,5 +16253,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr "Modifica opera d'arte"
@@ -16230,5 +16259,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr "Ufficio informazioni"
@@ -16236,80 +16265,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr "Modifica ufficio informazioni"
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "Mappa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr "Tipo di mappa"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr "mappa"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr "mappa cittadina"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr "mappa escursionistica"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr "mappa ciclistica"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
 msgid "Closer Description"
 msgstr "Descrizione più specifica"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1701
 msgid "Information Board"
 msgstr "Tabellone informativo"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Board Type"
 msgstr "Tipo di tabellone"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "board"
 msgstr "tavola"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "history"
 msgstr "storia"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "nature"
 msgstr "natura"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "wildlife"
 msgstr "fauna"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Guidepost (Hiking)"
 msgstr "Cartello di indicazioni (escursionismo)"
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr "Altri punti informativi"
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr "Modifica pensilina/ricovero"
@@ -16317,25 +16346,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr "Caminetto"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr "Area picnic"
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr "Modifica area picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "Luoghi storici"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "Castello"
@@ -16344,20 +16373,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr "Modifica castello"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "Rovine"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr "Modifica rovine"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr "Sito archeologico"
@@ -16366,10 +16395,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr "Modifica sito archeologico"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr "Campo di battaglia"
@@ -16377,5 +16406,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr "Modifica campo di battaglia"
@@ -16383,15 +16412,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr "Monumento"
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr "Modifica monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr "Memoriale"
@@ -16399,45 +16428,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr "Modifica memoriale"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr "Crocefisso"
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr "Crocefisso"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr "Edicola votiva"
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr "Modifica edicola votiva"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "Svago"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr "Parco acquatico"
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr "Modifica parco acquatico"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "Parco giochi"
@@ -16445,15 +16474,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr "Modifica parco giochi"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "Riserva di pesca"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr "Modifica riserva di pesca"
@@ -16461,15 +16490,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr "Strutture sportive"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "Stadio"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr "Modifica stadio"
@@ -16483,6 +16512,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "seleziona uno sport:"
@@ -16505,4 +16534,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -16563,5 +16600,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16571,5 +16616,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16715,5 +16760,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16819,5 +16864,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16858,29 +16903,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr "sport"
@@ -16890,227 +16936,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr "polivalente"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr "tiro con l'arco"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr "atletica"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr "football_australiano"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr "pallacanestro"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr "boccie"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr "canoa"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr "arrampicata"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr "reti_cricket"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr "cinodromo"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr "sport_equestri"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr "football_americano"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr "ginnastica"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr "ippodromo"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr "autodromo"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr "racchette"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr "poligono_di_tiro"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr "pattinaggio"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr "comprensorio_sciistico"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "calcio"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr "piscina"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "ping_pong"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr "Centro sportivo"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr "Modifica centro sportivo"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr "Campo sportivo"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr "Modifica campo sportivo"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr "Circuito (pista)"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr "Modifica circuito (pista)"
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr "Campo da golf"
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr "Modifica campo da golf"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr "Modifica minigolf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr "Struttura polivalente"
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr "Modifica struttura polivalente"
@@ -17149,191 +17195,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr "campo_sportivo"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr "centro_sportivo"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr "stadio"
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr "Modifica bowling"
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr "Atletica"
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr "Modifica atletica"
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr "Tiro con l'arco"
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr "Modifica tiro con l'arco"
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr "Arrampicata"
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr "Modifica arrampicata"
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr "Canoa"
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr "Modifca canoa"
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr "Ciclismo"
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr "Modifica ciclismo"
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr "Corse dei cani"
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr "Modifica corse dei cani"
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr "Equitazione"
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr "Modificare Equitazione"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr "Ippodromo"
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr "Modifica ippodromo"
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr "Ginnastica"
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr "Modificare Ginnastica"
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr "Sport motoristici"
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr "Modifica Sport Motoristici"
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr "Pattinaggio"
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr "Modificare Pattinaggio"
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr "Modificare Skateboard"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr "Piscina"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr "Modificare Nuoto"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr "Sci"
@@ -17341,56 +17387,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr "Modificare Sci"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr "Tipo di pista"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr "Sci alpino"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr "Sci nordico"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr "Difficoltà"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr "principante"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr "facile"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr "intermedio"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr "avanzato"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr "esperto"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr "Poligono di tiro"
@@ -17398,178 +17444,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr "Modifica poligono di tiro"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr "Sport (Pallone)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr "Calcio"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr "Modifica Calcio"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr "Football"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr "Modifica football"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr "Football australiano"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr "Modifica football australiano"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr "Modifica Baseball"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr "Pallacanestro"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr "Modifica Pallacanestro"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr "Modifica Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr "campo_da_golf"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr "Boule (sport popolare in Francia)"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr "Modifica boule (sport popolare in Francia)"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr "Bocce"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr "Modifica Bocce"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr "Modifica Cricket"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr "Reti per Cricket"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr "Modifica Reti per Cricket"
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr "Modifica croquet"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr "Modifica Hockey"
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr "Modifica Pelota"
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr "Modifica racquet"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr "Modifica Rugby"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr "Tennis da tavolo"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr "Modifica Tenniis da tavolo"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr "Modifica Tennis"
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "Edifici"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr "Palazzo"
@@ -17577,5 +17623,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "Edificio pubblico"
@@ -17583,10 +17629,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr "Modifica edificio pubblico"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "Municipio"
@@ -17594,10 +17640,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "Modifica Municipio"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "Ambasciata"
@@ -17605,10 +17651,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "Modifica ambasciata"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "Tribunale"
@@ -17617,10 +17663,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "Modifica Palazzio del tribunale"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "Prigione"
@@ -17629,10 +17675,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "Modifica Prigione"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "Polizia"
@@ -17642,10 +17688,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "Modifica Polizia"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "Vigili del fuoco"
@@ -17654,10 +17700,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "Modifica vigili del fuoco"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "Ufficio Postale"
@@ -17665,5 +17711,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr "Modifica Ufficio Postale"
@@ -17671,15 +17717,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr "Asilo"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr "Modifica Asilo"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "Scuola"
@@ -17687,10 +17733,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "Modifica Scuola"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr "Università"
@@ -17698,10 +17744,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr "Modifica Università"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr "Scuola superiore"
@@ -17709,5 +17755,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr "Modifica Scuola superiore"
@@ -17715,5 +17761,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "Cinema"
@@ -17722,10 +17768,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "Modifica Cinema"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "Biblioteca"
@@ -17734,10 +17780,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "Modifica biblioteca"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr "Centro Artistico"
@@ -17745,10 +17791,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr "Modifica centro d'arte"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "Teatro"
@@ -17757,10 +17803,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "Modifica Teatro"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr "Luogo di culto"
@@ -17770,5 +17816,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr "Modifica Luogo di culto"
@@ -17777,6 +17823,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr "Religione"
@@ -17785,66 +17831,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr "bahaismo"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr "Buddista"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr "Cristiana"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr "induismo"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr "giainismo"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr "Ebraica"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr "Mussulmana"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr "Spiritualista"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr "taoismo"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr "unitariano"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr "zoroastrismo"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr "Denominazione"
@@ -17853,81 +17899,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr "Anglicana"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr "Battista"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr "Cattolica"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr "Evangelica"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr "Testimoni di Geova"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr "Luterana"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr "Metodista"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr "Mormone"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr "Ortodossa"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr "Pentecostale"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr "Prebiteriana"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr "Protestante"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr "Quacchera"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr "sciismo"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr "sunnismo"
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr "Indirizzi"
@@ -17936,5 +17982,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr "Modifica dati indirizzo"
@@ -17942,5 +17988,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr "Numero civico"
@@ -17948,20 +17994,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr "Nome Casa"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr "Nome città"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "Codice postale"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr "Codice nazione"
@@ -17969,5 +18015,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr "Interpolazione indirizzo"
@@ -17976,5 +18022,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr "Modifica interpolazione indirizzo"
@@ -17982,71 +18028,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr "Schema numerazione"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr "dispari"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr "pari"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr "tutti"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr "alfabetico"
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr "Costruzioni umane"
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr "Fabbrica"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr "Modifica fabbrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "Torre"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "Modifica torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "Torre idrica"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "Modifica torre idrica"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr "Gasometro"
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr "Modifica gasometro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "Faro"
@@ -18054,10 +18100,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "Modifica faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "Mulino a vento"
@@ -18065,10 +18111,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "Modifica mulino a vento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "Conduttura"
@@ -18076,10 +18122,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "Modifica conduttura"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr "Depuratore acqua"
@@ -18089,10 +18135,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr "Modifica depuratore acqua"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr "Gru permanente"
@@ -18100,10 +18146,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr "Modifica gru permanente"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr "Torre radio"
@@ -18111,10 +18157,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr "Modifica torre radio"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr "Punto geodetico o altra stazione fissa"
@@ -18122,10 +18168,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr "Modifica punto geodetico o altra stazione fissa"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr "Telecamera di sorveglianza"
@@ -18133,5 +18179,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr "Modifica telecamera di sorveglianza"
@@ -18139,5 +18185,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr "Centrale elettrica"
@@ -18147,39 +18193,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr "Modifica centrale elettrica"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr "eolica"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr "idroelettrica"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr "a combustibile fossile"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr "fissione nucleare"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr "carbone"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr "gas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr "Stazione elettrica"
@@ -18188,10 +18234,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr "Modifica stazione elettrica"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr "Sottostazione elettrica"
@@ -18200,5 +18246,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr "Modifica sottostazione elettrica"
@@ -18206,10 +18252,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr "Riferimento linea"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr "Pilone (elettricità)"
@@ -18220,5 +18266,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr "Modifica pilone (elettricità)"
@@ -18226,5 +18272,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr "Linea elettrica"
@@ -18233,25 +18279,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr "Modifica linea elettrica"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr "Tensione"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr "Numero di linee"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr "Servizi"
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "Bagni"
@@ -18259,20 +18305,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr "Numero di riferimento"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr "Cassetta Postale"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "Telefono"
@@ -18281,5 +18327,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr "Modifica Telefono"
@@ -18287,5 +18333,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "Monete"
@@ -18293,5 +18339,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr "Note"
@@ -18299,5 +18345,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr "Portafogli elettronici e carte di debito"
@@ -18305,5 +18351,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr "Carte di debito"
@@ -18311,15 +18357,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "Carte di credito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "Carte telefoniche"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr "Riciclaggio"
@@ -18328,5 +18374,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr "Modifica Stazione di riciclaggio"
@@ -18334,35 +18380,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr "Batterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr "Lattine"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr "Vestiti"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr "Vetro"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr "Carta"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr "Rottami metallici"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr "Panchina"
@@ -18371,20 +18417,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr "Postazione di caccia"
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr "Modifica una postazione di caccia"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr "Nascondi"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr "Blocco"
@@ -18392,22 +18438,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr "Modifica Albero"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr "basso"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr "mezzo"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr "completo"
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr "Fontana"
@@ -18416,10 +18462,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr "Modifica Fontana"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "Acqua potabile"
@@ -18428,10 +18474,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "Modifica acqua potabile"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr "Culla per la vita"
@@ -18439,25 +18485,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr "Modifica culla per la vita"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "Negozi"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr "Supermercato"
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr "Modifica Supermercato"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr "Minimarket"
@@ -18465,10 +18511,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr "Modifica minimarket"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr "Chiosco"
@@ -18476,10 +18522,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr "Modificia Chiosco"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "Distributore automatico"
@@ -18487,5 +18533,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "Modifica Distributore automatico"
@@ -18493,88 +18539,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "Distributore automatico"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr "Biglietti trasporto pubblico"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr "Orari trasporto pubblico"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr "Biglietti per il parcheggio"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr "Alimenti"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "Bevande"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr "Dolci"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr "Sigarette"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr "fotografie"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr "Cibo per animali"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "Giornali"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "giocattoli"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr "francobolli"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "Schede SIM"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr "buoni_telefonici"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr "buoni"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr "preservativi"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr "assorbenti"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr "Sacchetto per escrementi"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr "Conto o carta fedeltà"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "Macellaio"
@@ -18582,10 +18628,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "Modifica Macellaio"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "Panificio"
@@ -18593,10 +18639,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "Modifica Panificio"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr "Fiorista"
@@ -18604,20 +18650,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr "Modifica Fiorista"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr "Prodotti biologici"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr "Modifica negozio di prodotti biologici"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr "Alcolici (non in Italia)"
@@ -18625,60 +18671,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr "Modifica negozio di alcolici (non in Italia)"
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr "Bevande"
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr "Modifica negozio di bevande"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr "Computer"
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr "Modifica negozio di informatica"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr "Elettronica"
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr "Modifica Negozio di Elettronica"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr "Hi-Fi"
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr "Modifica negozio di Hi-Fi"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr "Mobilia"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr "Modifica Negozio di Mobilia"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr "Giardinaggio"
@@ -18686,10 +18732,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr "Modifica giardinaggio"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr "Ferramenta"
@@ -18697,10 +18743,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr "Modifica Negozio di Ferramenta"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr "Fai-da-te"
@@ -18708,60 +18754,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr "Modifica negozio Fai-da-te"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr "Cartoleria"
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr "Modifica cartoleria"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr "Parrucchiere/barbiere"
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr "Modifica parrucchiere/barbiere"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr "Calzature"
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr "Modifica Negozio di Scarpe"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr "Giocattoli"
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr "Modifica Negozio di Giocattoli"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr "Videoteca"
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr "Modifica videoteca"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "Lavanderia a secco"
@@ -18769,10 +18815,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "Modifica Lavanderia a secco"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "Lavanderia"
@@ -18780,10 +18826,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "Modifica lavanderia"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr "Sport all'aperto"
@@ -18791,35 +18837,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr "Modifica sport all'aperto"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr "Articoli sportivi"
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr "Modifica articoli sportivi"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr "Ottico"
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr "Modifica Ottico"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "Contanti"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "Banca"
@@ -18827,5 +18873,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "Modifica banca"
@@ -18833,10 +18879,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "Bancomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr "Cambiavalute"
@@ -18844,5 +18890,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr "Modifica cambiavalute"
@@ -18850,15 +18896,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "Modifica bancomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "Salute"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr "Ambulatorio"
@@ -18866,20 +18912,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr "Modifica ambulatorio"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr "Modifica dentista"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "Farmacia"
@@ -18887,5 +18933,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "Modifica Farmacia"
@@ -18893,10 +18939,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr "Vendita medicinali con obbligo di prescrizione"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "Ospedale"
@@ -18904,10 +18950,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "Modifica Ospedale"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr "Colonnina SOS"
@@ -18916,5 +18962,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr "Modifica Colonnina SOS"
@@ -18923,20 +18969,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr "Numero del punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr "Nome del punto"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr "Numero di telefono"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Usare prefisso internazionale, es. +12-345-67890)"
@@ -18944,5 +18990,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -18951,56 +18997,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr "Modifica veterinario"
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr "Continente"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr "Modifica continente"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr "Stato"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr "Modifica stato"
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr "Regione"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr "Modifica regione"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr "Provincia"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr "Modifica provincia"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr "Contea (in Italia NON usare)"
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr "Modifica contea (in Italia NON usare)"
@@ -19008,15 +19053,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr "Città"
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr "Modifica città"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr "Paese"
@@ -19024,10 +19069,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr "Modifica Paese"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr "Sobborgo"
@@ -19035,25 +19080,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr "Modifica Sobborgo"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "Frazione"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "Modifica Frazione"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr "Borgo"
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr "Modifica Borgo"
@@ -19061,5 +19106,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr "Luogo che ha un nome, ma non popolato"
@@ -19067,10 +19112,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr "Località"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "Isola"
@@ -19078,5 +19123,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "Modifica isola"
@@ -19084,5 +19129,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr "Entrata di una grotta/caverna"
@@ -19090,10 +19135,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr "Modifica entrata di una grotta/caverna"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "Picco montuoso"
@@ -19101,10 +19146,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "Modifica picco montuoso"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr "Ghiacciaio"
@@ -19112,10 +19157,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr "Modifica Ghiacciaio"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr "Vulcano"
@@ -19123,70 +19168,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr "Modifica vulcano"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr "Confini"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr "Nazionale"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr "Modifica confine nazionale"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr "Amministrativo"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr "Modifica confine amministrativo"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr "Civile"
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr "Modifica confine civile"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr "Politico"
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr "Modifica confine politico"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr "Parco nazionale"
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr "Modifica Confine Parco Nazionale"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr "Uso del terreno"
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "Albero"
@@ -19195,15 +19240,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "Modifica albero singolo"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr "Nome Botanico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr "Bosco"
@@ -19212,5 +19257,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr "Modifica bosco"
@@ -19218,17 +19263,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr "Conifere"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr "deciduo (caducifoglie)"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr "Mista"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "Foresta"
@@ -19237,14 +19282,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr "Modifica area di foresta"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr "Riserva naturale"
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr "Modifica riserva naturale"
@@ -19252,25 +19297,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr "Ghiaione"
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr "Modifica Ghiaione"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr "Boscaglia"
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr "Modifica boscaglia"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr "Fell"
@@ -19278,10 +19323,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr "Modifica Fell"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr "Brughiera"
@@ -19289,5 +19334,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr "Modifica brughiera"
@@ -19295,5 +19340,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr "Aia"
@@ -19302,45 +19347,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr "Modifica aia"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr "Area agricola"
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr "Modifica area agricola"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr "Prato"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr "Modifica area a prato"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr "Vigna"
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr "Modifica area di vigneto"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr "Area pubblica concessa ai cittadini per la realizzazione di orti"
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -19349,25 +19394,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr "Giardino"
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr "Modifica giardino"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr "Erba"
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr "Modifica area di prato"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr "Village Green"
@@ -19375,10 +19420,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr "Modifica Village Green"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr "Common (UK)"
@@ -19386,20 +19431,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr "Modifica una Common (UK)"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr "Parco"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr "Modifica parco"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr "Area di svago"
@@ -19407,5 +19452,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr "Modifica area di svago"
@@ -19413,15 +19458,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr "Residential Landuse"
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr "Modifica Residential Landuse"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr "Cimitero"
@@ -19429,9 +19474,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr "Modifica Cimitero"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr "Cimitero"
@@ -19439,39 +19484,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr "Modifica area di cimitero (esteso)"
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr "Commerciale (negozi)"
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr "Modifica area commerciale (negozi)"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr "Commerciale (uffici)"
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr "Modifica area commerciale (uffici)"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr "Industriale"
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr "Modifica area industriale"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr "Deposito materiale ferroviario"
@@ -19479,15 +19524,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr "Modifica deposito materiale ferroviario"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr "Militare"
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr "Modifica area militare"
@@ -19495,55 +19540,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr "Area in costruzione"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr "Modifica area in costruzione"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr "Ridestinazione d'uso"
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr "Modifica area di ridestinazione d'uso"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr "Area agricola destinata alla costruzione"
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr "Modifica area agricola destinata alla costruzione"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr "Discarica"
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr "Modifica area di discarica"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr "Cava"
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr "Modifica area di cava/miniera"
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr "Multi-poligono"
@@ -19553,5 +19598,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr "Modifica un multi-poligono"
@@ -19560,10 +19605,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr "segmento esterno"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr "segmento interno"
@@ -19571,5 +19616,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr "Divieto di svolta"
@@ -19578,5 +19623,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr "Modifica un divieto di svolta"
@@ -19584,34 +19629,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr "Divieto"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr "no svolta a sinistra"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr "no svolta a destra"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr "non diritto"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr "no inversione di marcia"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr "solo svolta a destra"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr "solo svolta a sinistra"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr "solo diritto"
@@ -19620,15 +19665,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr "dal percorso"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr "attraverso il nodo o percorso"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr "verso il percorso"
@@ -19636,5 +19681,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr "Percorso"
@@ -19643,5 +19688,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr "Modifica un percorso"
@@ -19649,5 +19694,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr "Tipo di percorso"
@@ -19719,24 +19764,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr "bicicletta"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr "strada"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr "traghetto"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr "sci"
@@ -19789,20 +19834,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr "pedone"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr "escursionismo"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr "deviazione"
@@ -19816,10 +19861,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr "metropolitana"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr "Descrizione del simbolo"
@@ -19827,26 +19872,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr "Rete"
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "Tipo di percorso"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr "proposto"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr "alternativo"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr "temporaneo"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr "collegamento"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr "Colore (esadecimale)"
@@ -19855,30 +19906,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr "segmento di percorso"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr "segmento diretto"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr "segmento opposto"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr "punto di fermata"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr "punto di fermata diretto"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr "punto di fermata opposto"
@@ -19914,6 +19965,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19929,5 +19981,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19946,5 +20006,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr "standard"
@@ -20038,7 +20098,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr "ponte"
@@ -20303,15 +20363,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr "deprecato"
@@ -20353,5 +20413,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr "cavallo"
@@ -20489,4 +20549,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20498,5 +20564,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20504,5 +20570,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20539,5 +20605,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20561,11 +20627,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr "barriera"
@@ -20589,5 +20655,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20628,5 +20694,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20664,6 +20730,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr "strada"
@@ -20719,7 +20785,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr "tracciato_stradale"
@@ -20772,11 +20838,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr "ferrovia"
@@ -20797,5 +20871,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr "servizi"
@@ -20809,5 +20883,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr "guado"
@@ -20828,5 +20902,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr "slargo per inversione di marcia"
@@ -20840,6 +20914,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr "punto di accesso di emergenza"
@@ -20854,5 +20928,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr "sponda"
@@ -20866,5 +20940,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr "torrente"
@@ -20878,5 +20952,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr "darsena"
@@ -20904,5 +20978,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr "acquedotto"
@@ -21045,5 +21119,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -21070,13 +21144,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr "costruzioni umane"
@@ -21138,7 +21212,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr "punto ferroviario"
@@ -21161,10 +21235,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr "altro_ferrovia"
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr "ferrovia (sopra)"
@@ -21200,7 +21274,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr "vecchia_ferrovia"
@@ -21245,6 +21319,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr "aeroporto"
@@ -21258,5 +21332,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr "terminal"
@@ -21278,5 +21352,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr "aeroporto (scuro)"
@@ -21290,5 +21364,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr "aeroporto (chiaro)"
@@ -21296,4 +21370,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21336,7 +21417,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr "struttura_di_risalita"
@@ -21353,5 +21434,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr "pista_facile"
@@ -21366,5 +21447,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr "pista_intermedia"
@@ -21379,5 +21460,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr "pista_avanzata"
@@ -21392,5 +21473,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr "pista esperto"
@@ -21405,5 +21486,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr "pista_libera"
@@ -21418,5 +21499,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr "pista_principiante"
@@ -21439,4 +21520,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -21447,4 +21535,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -21521,10 +21617,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr "elettricità"
@@ -21538,5 +21635,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr "pontile"
@@ -21550,5 +21647,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr "conduttura"
@@ -21676,12 +21773,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr "struttura per lo svago"
@@ -21695,5 +21792,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr "porto turistico"
@@ -21765,8 +21862,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr "struttura di servizio"
@@ -21868,10 +21965,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr "servizio al traffico"
@@ -21891,4 +21988,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21910,4 +22014,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -22231,4 +22342,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -22255,24 +22374,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr "struttura di servizio (chiaro)"
@@ -22304,6 +22431,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr "acqua (chiaro)"
@@ -22364,8 +22491,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr "salute"
@@ -22718,26 +22845,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr "negozio"
@@ -22792,5 +22919,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22809,8 +22936,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr "hotel"
@@ -22960,9 +23087,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr "turismo"
@@ -23034,8 +23161,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr "attrazione storica"
@@ -23106,8 +23233,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr "verde"
@@ -23121,5 +23248,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr "cava/miniera"
@@ -23133,5 +23260,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr "discarica"
@@ -23153,5 +23280,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr "bacino"
@@ -23165,5 +23292,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr "foresta"
@@ -23177,5 +23304,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr "aia"
@@ -23198,5 +23325,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr "area commerciale (negozi)"
@@ -23210,5 +23337,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr "industriale"
@@ -23222,5 +23349,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr "ridestinazione d'uso"
@@ -23234,5 +23361,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr "area agricola destinata alla costruzione"
@@ -23246,5 +23373,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr "area ferroviaria"
@@ -23301,7 +23428,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr "militare"
@@ -23315,5 +23442,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr "cimitero"
@@ -23326,5 +23453,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr "picco montuoso"
@@ -23339,5 +23466,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr "ghiacciaio"
@@ -23351,5 +23478,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr "vulcano"
@@ -23404,8 +23531,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr "elemento naturale"
@@ -23419,5 +23546,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr "boscaglia"
@@ -23431,5 +23558,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr "brughiera"
@@ -23443,5 +23570,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr "bosco"
@@ -23455,5 +23582,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr "zona fangosa (sabbie mobili)"
@@ -23467,5 +23594,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr "spiaggia"
@@ -23543,8 +23670,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr "percorso"
@@ -23592,7 +23719,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr "confine"
@@ -23734,10 +23861,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr "luogo"
@@ -23785,6 +23912,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr "indirizzo"
@@ -24081,44 +24208,21 @@
 msgstr "Terraserver Urban"
 
-#~ msgid ""
-#~ "Failed to access system property ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "E'' fallito il tentativo di accedere alla proprietà di sistema ''{0}'' "
-#~ "per ragioni di sicurezza. L''eccezione è stata: {1}"
-
-#~ msgid "Unknown file extension for file ''{0}''"
-#~ msgstr "Estensione del file sconosciuta per il file ''{0}''"
+#~ msgid "Not implemented yet."
+#~ msgstr "Non ancora implementato."
+
+#~ msgid "Data Layer"
+#~ msgstr "Livello dati"
+
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Move"
+#~ msgstr "Sposta"
+
+#~ msgid "unnamed"
+#~ msgstr "Senza nome"
 
 #~ msgid "Unknown file extension."
 #~ msgstr "L'estensione del file è sconosciuta."
-
-#~ msgid "An error occurred while saving. Error is: {0}"
-#~ msgstr ""
-#~ "E'' stato generato un errore durante il salvataggio. L''errore è: {0}"
-
-#~ msgid "Move"
-#~ msgstr "Sposta"
-
-#~ msgid "Invalid projection"
-#~ msgstr "Proiezione non valida"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Modificare prima la proiezione in {0}."
-
-#~ msgid "end"
-#~ msgstr "fine"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Non ancora implementato."
-
-#~ msgid "Data Layer"
-#~ msgstr "Livello dati"
-
-#~ msgid "Email"
-#~ msgstr "Email"
-
-#~ msgid "unnamed"
-#~ msgstr "Senza nome"
 
 #~ msgid "Change"
@@ -24226,4 +24330,7 @@
 #~ msgid "Navigation"
 #~ msgstr "Navigazione"
+
+#~ msgid "end"
+#~ msgstr "fine"
 
 #~ msgid "Revert"
@@ -24489,4 +24596,10 @@
 #~ "desidera continuare?"
 
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Modificare prima la proiezione in {0}."
+
+#~ msgid "Invalid projection"
+#~ msgstr "Proiezione non valida"
+
 #~ msgid ""
 #~ "An error occured while trying to match the photos to the GPX track. You "
@@ -24654,2 +24767,16 @@
 #~ msgid "No data"
 #~ msgstr "Nessun dato"
+
+#~ msgid ""
+#~ "Failed to access system property ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+#~ msgstr ""
+#~ "E'' fallito il tentativo di accedere alla proprietà di sistema ''{0}'' "
+#~ "per ragioni di sicurezza. L''eccezione è stata: {1}"
+
+#~ msgid "Unknown file extension for file ''{0}''"
+#~ msgstr "Estensione del file sconosciuta per il file ''{0}''"
+
+#~ msgid "An error occurred while saving. Error is: {0}"
+#~ msgstr ""
+#~ "E'' stato generato un errore durante il salvataggio. L''errore è: {0}"
Index: /applications/editors/josm/i18n/po/ja.po
===================================================================
--- /applications/editors/josm/i18n/po/ja.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/ja.po	(revision 17069)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
-"PO-Revision-Date: 2009-08-04 10:42+0000\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
+"PO-Revision-Date: 2009-08-10 13:35+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-08-10 11:58+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -56,6 +56,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -100,6 +100,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "エラー"
@@ -111,5 +111,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "保存されていない変更"
@@ -129,10 +129,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -149,15 +149,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -187,6 +187,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -216,5 +216,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -370,5 +370,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
 msgstr ""
@@ -452,9 +452,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -487,7 +487,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -568,37 +568,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "データ"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "レイヤ"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "選択"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "競合"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "ダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "{0}へズーム"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "{0}のビューへズーム"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -608,30 +608,30 @@
 msgstr "表示: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "ズームする選択がありませｎ"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "ズームの対象になる競合はありません"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "ウエイの結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "複数のウエイを一つに結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "結合する少なくとも二つのウエイを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr "異なるメンバーであるウェイを結合しますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -641,13 +641,13 @@
 "か？"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "強制的に連結。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "方向を変更しますか?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -655,10 +655,10 @@
 msgstr "ウエイは現在の方向で結合できません。一方の方向にそろえますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "逆転して接続"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -666,20 +666,20 @@
 msgstr "すべての競合に値を入力してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "競合を解決する"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "{0}ウェイを結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "ウェイが全て空です。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -725,6 +725,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -746,6 +746,6 @@
 msgstr "選択したオブジェクトを削除します"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -755,5 +755,5 @@
 msgstr "上書きする"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -885,7 +885,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "データをGPXファイルにエクスポートします。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -901,5 +900,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -917,5 +916,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -987,22 +986,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "ノードの結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "一番古いものにノードをマージします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "結合する少なくとも二つのウエイを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr "異なったメンバーになっているノードを結合しますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1010,14 +1009,14 @@
 msgstr "選択したノードは、異なった関連に属しています。それでも、結合しますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "強制的に結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
 "ノードを結合できません：使用しているウェイを削除しないとけなくなります。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1272,7 +1271,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "一つも開かれたデータがありませんんで、保存されません。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1868,5 +1866,5 @@
 msgstr "ダウンロード中にエラーです。"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1878,5 +1876,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr ""
@@ -1915,11 +1913,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2058,5 +2056,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2132,5 +2130,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "オブジェクトを検索する。"
@@ -2259,5 +2257,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "検索"
@@ -2462,5 +2460,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2503,5 +2501,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr "関連から削除"
@@ -2543,8 +2541,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "{0}ノードを結合する"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2580,8 +2579,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "{0}ノード"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2746,7 +2746,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "{0}このオブジェクトを変更"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2756,5 +2756,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2799,5 +2799,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2829,5 +2829,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2840,5 +2840,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "鉄道"
@@ -2853,5 +2853,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3134,5 +3134,5 @@
 msgstr "今後は表示しない"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3141,5 +3141,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3149,10 +3149,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3160,25 +3160,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "不明な"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3188,9 +3188,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3199,9 +3199,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "予期しない例外"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3211,9 +3223,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "不明なホスト"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3223,5 +3235,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr ""
@@ -3311,10 +3323,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "ユーザ名"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "パスワード"
@@ -3518,15 +3530,15 @@
 msgstr "(オブジェクトなし)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "レイヤーがリストにありません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3580,5 +3592,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr ""
@@ -3587,5 +3599,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr ""
@@ -3594,20 +3606,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3617,6 +3629,6 @@
 msgstr "タグ"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3624,6 +3636,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3631,40 +3643,40 @@
 msgstr "メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3672,74 +3684,74 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3747,30 +3759,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3778,5 +3790,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3784,13 +3796,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3798,5 +3810,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3804,21 +3816,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3827,27 +3839,27 @@
 msgstr "削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3855,5 +3867,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3862,5 +3874,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3869,5 +3881,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3876,5 +3888,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -3883,21 +3895,21 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -3907,5 +3919,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -3915,5 +3927,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -3921,19 +3933,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -3942,19 +3954,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -3963,9 +3975,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -3975,13 +3987,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -3989,90 +4001,90 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr "(なし)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "削除された"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4082,17 +4094,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4101,14 +4113,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4116,21 +4128,21 @@
 msgstr "役割"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4138,14 +4150,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4153,7 +4165,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4165,7 +4177,7 @@
 msgstr "キー"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4178,45 +4190,45 @@
 msgstr "値"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr ""
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4236,8 +4248,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4274,5 +4286,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4374,83 +4386,83 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "レイヤー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "全ての読み込んだレイヤのリストを開きます"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "選択したレイヤーの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr "レイヤー削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "表示/非表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "選択したレイヤーの表示状態を切り替え"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "選択したレイヤーを一つ上に上げます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "選択したレイヤーを一つ下に移動します。"
@@ -4460,6 +4472,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4467,22 +4479,22 @@
 msgstr[0] "これは、最大{0}このオブジェクトが変更されます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "空の値でキーを削除。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<差異あり>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "値を変更しますか?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4490,5 +4502,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4496,40 +4508,40 @@
 msgstr[0] "{0}このオブジェクトのプロパティーの変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "キーを選択してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "値を選択してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 msgid "Please select the objects you want to change properties for."
 msgstr "プロパティを変えたいオブジェクトを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "プロパティ/メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "選択されたオブジェクトのプロパティ"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "プロパティの追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4546,39 +4558,39 @@
 msgstr "追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 msgid "Add a new key/value pair to all objects"
 msgstr "すべてのオブジェクトに新しいキー/値をペアで追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "プロパティの編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 msgid "Edit the value of the selected key for all objects"
 msgstr "すべてのオブジェクトの選択したキーの値の編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "プロパティ: {0} / メンバー: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "プロパティ/メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "関連の変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "本当に関連{0}から選択分を削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "すべてのオブジェクトの選択したキーの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "プロパティの削除"
@@ -4590,5 +4602,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "リレーション"
@@ -4620,31 +4632,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "現在の選択範囲"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "セレクションリスト　ウインドウを開きます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "選択したエレメントのズーム"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "選択したリストを更新する。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "セレクションへズーム"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "選択: 関連:{0}/ウェイ:{1}/ノード:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4652,5 +4664,5 @@
 msgstr "選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4658,5 +4670,5 @@
 msgstr[0] "{0}ウェイ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4664,5 +4676,5 @@
 msgstr[0] "{0} 関連"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -4874,7 +4886,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "選択したリレーションを削除"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -4957,5 +4968,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5196,5 +5207,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "地名"
@@ -5241,21 +5252,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "タイプ"
@@ -6055,72 +6066,512 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "名前"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr "{0} のイメージ"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr "GPXの読み込み…"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "地点 {0} x {1}に時刻がありません"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "時刻 \"{0}\"を地点 {1}×{2} から読み取ることができませんでした"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr "読み取り可能な時刻のついた画像が見つかりませんでした。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "{0}を読み込んでいます ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr "ジオタグのついた画像"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS開始: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS終了: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr "現在の差分: {0} 秒"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr "タイムゾーンの違い: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "画像"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr "トラック内に {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "時計の同期"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "JPEGイメージ(*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "ファイル \"{0}\"中の日付が取得できません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "ファイル\"{0}\"にEXIFの時刻情報がありません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "画像"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "写真の日付を入力(mm/dd/yyyy HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr "GPSユニットのタイムゾーン(写真の時間との違い)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr "時刻をGPSユニットと同期する"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr "入力した時刻は、解釈できません"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr "GPSポイント"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "線描画のカスタマイズ"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr "全体設定を使用"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr "このレイヤーの点の間に線を引く。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr "このレイヤーの点の間に線を引かない。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr "線描画オプションの選択"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "配色のカスタマイズ"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "既定"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "色選択"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr "名前のついた地点からのマーカー"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "{0} からの名前付きトラックポイント"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "音声のインポート"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr "WAV音声ファイル(*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "{0} からの音声マーカー"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "イメージのインポート"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} トラック "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0}ルート, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} ウェイポイント"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr "名前: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr "記述: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr "Timespan: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr "長さ: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "データレイヤーへ変換"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+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>もしトレースをアップロードしたいならば、ここを見"
+"てください："
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr "{0}からのコンバート"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr "このトラックに沿ってOSMからダウンロード"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr "次の範囲内の全てをダウンロード:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr "{0} メータ"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr "リクエストあたりの最大面積："
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} 平方キロメートル"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>この操作には、{0}この独立したダウンロード要求を<br>必要とします。続けま"
+"すか？</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"トラックの開始以前又は終了以後のタイムスタンプがあるウェイポイントは、開始点"
+"に変更又は移動されました。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"ウエイポイントの一部にトラックから遠すぎて、時間を推測出来ないものがあり、除"
+"外します。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr "データーレイヤー {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr "ダウンロード領域の外"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr "バージョン {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0}は次からなります:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0}は削除されました)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr "設定解除"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr "APIバージョン: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr "GPXレイヤーの変換"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6129,7 +6580,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6139,445 +6590,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "名前"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr "{0} のイメージ"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr "GPXの読み込み…"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "地点 {0} x {1}に時刻がありません"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "時刻 \"{0}\"を地点 {1}×{2} から読み取ることができませんでした"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr "読み取り可能な時刻のついた画像が見つかりませんでした。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "{0}を読み込んでいます ..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr "ジオタグのついた画像"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS開始: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS終了: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr "現在の差分: {0} 秒"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr "タイムゾーンの違い: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "画像"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr "トラック内に {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "時計の同期"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "JPEGイメージ(*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "ファイル \"{0}\"中の日付が取得できません。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "ファイル\"{0}\"にEXIFの時刻情報がありません。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "画像"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "写真の日付を入力(mm/dd/yyyy HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr "GPSユニットのタイムゾーン(写真の時間との違い)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr "時刻をGPSユニットと同期する"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr "入力した時刻は、解釈できません"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr "GPSポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "線描画のカスタマイズ"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "全体設定を使用"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr "このレイヤーの点の間に線を引く。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr "このレイヤーの点の間に線を引かない。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr "線描画オプションの選択"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "配色のカスタマイズ"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "既定"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "色選択"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr "名前のついた地点からのマーカー"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "{0} からの名前付きトラックポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "音声のインポート"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr "WAV音声ファイル(*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "{0} からの音声マーカー"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "イメージのインポート"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} トラック "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0}ルート, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} ウェイポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr "名前: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr "記述: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr "Timespan: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr "長さ: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "データレイヤーへ変換"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-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>もしトレースをアップロードしたいならば、ここを見"
-"てください："
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr "{0}からのコンバート"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr "このトラックに沿ってOSMからダウンロード"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr "次の範囲内の全てをダウンロード:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr "{0} メータ"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr "リクエストあたりの最大面積："
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} 平方キロメートル"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>この操作には、{0}この独立したダウンロード要求を<br>必要とします。続けま"
-"すか？</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-"トラックの開始以前又は終了以後のタイムスタンプがあるウェイポイントは、開始点"
-"に変更又は移動されました。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"ウエイポイントの一部にトラックから遠すぎて、時間を推測出来ないものがあり、除"
-"外します。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr "データーレイヤー {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr "ダウンロード領域の外"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr "バージョン {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0}は次からなります:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0}は削除されました)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr "設定解除"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr "APIバージョン: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr "GPXレイヤーの変換"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -6958,5 +6969,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "自動車"
@@ -6973,16 +6984,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "自転車"
@@ -7010,14 +7023,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "徒歩"
@@ -7229,19 +7245,19 @@
 msgstr "言語"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr "ビルトインのデフォルトを有効"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr ""
@@ -7370,35 +7386,11 @@
 msgstr "プロキシーのパスワード"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr "OSMサーバのベースURL（REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr "OSMのログインパスワード。空白にすればパスワードを格納しません。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "サーバのベースURL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "OSMパスワード"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -7754,7 +7746,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "\"{0}\"を読み込めません。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -7859,7 +7851,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "不明なロール\"{0}\"です。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8019,23 +8011,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "正しくないパスワードかユーザ名です。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "警告:パスワードは暗号化されずに送信されます。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "ユーザーとパスワードを保存します(暗号化されません)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "パスワードを入力して下さい"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
 msgstr "ログイン"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr "OSMのログインパスワード。空白にすればパスワードを格納しません。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "OSMパスワード"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -8198,14 +8214,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "{0}のメンバーのタイプが不明"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "OSMデータを準備します…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr "III-形式のノードID"
@@ -8663,5 +8679,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr "説明"
@@ -9079,5 +9095,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr "ファイルの読み込みエラー"
@@ -9317,5 +9333,4 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
-#, fuzzy
 msgid ""
 "To enable the cadastre WMS plugin, change\n"
@@ -9323,6 +9338,4 @@
 "projection and retry"
 msgstr ""
-"土地台帳WMSプラグインを可能にするために、JOSMの座標系をランバート投影法に変え"
-"て、再起動してください。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9411,5 +9424,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -9949,7 +9962,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr "水域(湖沼)"
@@ -10126,7 +10139,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "名前"
+msgstr ""
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10686,12 +10698,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "開始"
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0}ノード"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -10829,5 +10841,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr "ストリートの名前"
@@ -11641,7 +11653,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr "ビル"
@@ -11655,5 +11667,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr "領域"
@@ -11886,17 +11898,14 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "編集する列を選択してください。"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "レイヤー削除"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Start adjusting"
-msgstr "ルーティングの開始"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
@@ -11905,7 +11914,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "アップロードする変更はありません。"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -11916,19 +11924,19 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr "自動ダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS レイヤ ({0}), 自動的に倍率 {1} でダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS レイヤ ({0}), 自倍率 {1} でダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -11936,42 +11944,42 @@
 "要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr "見えるタイルのダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr "解像度の変更"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr "誤ったタイルのリロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr "アルファチャンネル"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr "WMSレイヤーをファイルに保存"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr "WMSレイヤーをファイルから読み込む"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "未サポートの WMSファイルのバージョン; 発見 {0}, 予想 {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr "ファイルフォーマットエラー"
@@ -12314,4 +12322,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12348,5 +12358,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr "ストリート"
@@ -12357,5 +12367,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "高速道路・有料道路"
@@ -12364,5 +12374,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr "高速道路の編集"
@@ -12389,8 +12399,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr "道路番号"
@@ -12431,21 +12441,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr "レイヤー"
@@ -12459,8 +12469,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr "車線数"
@@ -12478,15 +12488,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr "最高速度（km/h）"
@@ -12523,16 +12533,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr "一方通行"
@@ -12574,19 +12584,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "橋"
@@ -12622,19 +12632,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr "トンネル"
@@ -12668,18 +12678,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr "切り通し"
@@ -12713,18 +12723,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr "土手"
@@ -12732,5 +12742,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr "高速道路の連絡路"
@@ -12739,5 +12749,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr "高速道路の連絡路の編集"
@@ -12745,5 +12755,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr "国道"
@@ -12752,5 +12762,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr "国道の編集"
@@ -12760,6 +12770,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr ""
@@ -12767,5 +12777,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr "国道の連絡路"
@@ -12774,5 +12784,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr "国道の連絡路の編集"
@@ -12785,5 +12795,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "都道府県道"
@@ -12792,5 +12802,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr "都道府県道を編集"
@@ -12798,10 +12808,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr "都道府県道の連絡路"
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr "都道府県道の連絡路の編集"
@@ -12813,5 +12823,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "主要道路"
@@ -12821,5 +12831,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr "主要道路の編集"
@@ -12827,5 +12837,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr "主要道路(Tertiary)"
@@ -12835,5 +12845,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr "主要道路(Tertiary)の編集"
@@ -12845,5 +12855,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "１車線道"
@@ -12853,5 +12863,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr "分類なし道路の編集"
@@ -12878,19 +12888,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr "幅(m)"
@@ -12902,5 +12912,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "敷地内道路"
@@ -12909,5 +12919,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr "敷地内道路の編集"
@@ -12931,13 +12941,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr "表面"
@@ -12957,20 +12967,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr "舗装"
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr "未舗装"
@@ -12978,12 +12988,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr "敷石"
@@ -12991,5 +13001,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr "私道"
@@ -12998,5 +13008,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr "私道の編集"
@@ -13004,5 +13014,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr "サービス"
@@ -13011,5 +13021,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr "サービス道路の編集"
@@ -13019,18 +13029,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr "サービス路のタイプ"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr "裏通り・路地"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr "私道"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr "駐車場の通路"
@@ -13038,5 +13048,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr "駐車場の通路"
@@ -13046,5 +13056,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr "駐車場の通路の編集"
@@ -13052,5 +13062,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr "道路（種別不明)"
@@ -13059,5 +13069,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr "種別不明道路の編集"
@@ -13066,20 +13076,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr "通行制限"
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr "通行制限の編集"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr "料金"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr "行き止まり(cul-de-sac)"
@@ -13092,8 +13102,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr "アクセス"
@@ -13137,23 +13147,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr "はい"
@@ -13166,40 +13176,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr "私道"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr "指定済み"
@@ -13212,19 +13222,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr "行き先"
@@ -13247,65 +13257,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr "関係車両のみ可"
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr "農業の"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr "いいえ"
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr "貨物トラック"
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "大型車"
@@ -13320,10 +13330,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr "馬"
@@ -13339,13 +13349,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr "自動二輪"
@@ -13361,30 +13371,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr "自動車"
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr "モーターボート"
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr "ボート"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr "最小速度（km/h)"
@@ -13392,25 +13402,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr "最大重量（トン）"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr "最大高（ｍ）"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr "最大幅（ｍ）"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr "最大長（ｍ）"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr "ロータリー交差点"
@@ -13421,5 +13431,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr "ジャンクションの編集"
@@ -13441,9 +13451,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr "タイプ"
@@ -13463,10 +13473,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr "高速道路"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr "高速道路のランプ"
@@ -13488,10 +13498,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr "国道"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr "国道の連絡路"
@@ -13513,10 +13523,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr "都道府県道"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr "都道府県道の連絡路"
@@ -13538,6 +13548,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr "主要道路"
@@ -13551,9 +13561,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr "敷地内道路"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr "１車線道"
@@ -13567,9 +13577,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr "敷地内道路"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr "私道"
@@ -13599,10 +13609,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr "サービス"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr "バスレーン"
@@ -13610,4 +13620,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13625,6 +13642,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr "工事中"
@@ -13635,10 +13652,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr "橋の編集"
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr "トンネルの編集"
@@ -13646,19 +13663,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr "ウエイ"
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr "工事中"
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr "工事中道路の編集"
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr "ジャンクション"
@@ -13674,5 +13691,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr "ロータリー交差点"
@@ -13681,5 +13698,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr "馬道"
@@ -13687,5 +13704,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr "馬道の編集"
@@ -13693,5 +13710,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr "自転車道"
@@ -13701,5 +13718,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr "自転車道の編集"
@@ -13707,5 +13724,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr "歩道"
@@ -13714,5 +13731,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr "歩道の編集"
@@ -13720,5 +13737,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr "ペデストリアン・歩行者用市街道路"
@@ -13727,5 +13744,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr "ペデストリアンデッキ、歩行者専用道路の編集"
@@ -13733,5 +13750,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr "階段"
@@ -13741,5 +13758,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr ""
@@ -13748,5 +13765,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr "トラック"
@@ -13755,14 +13772,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr "トラックの編集"
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr "砂利道"
@@ -13770,18 +13787,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr "地表"
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr "草地"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr "砂地"
@@ -13789,5 +13806,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr "トラック グレード 1"
@@ -13796,5 +13813,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr "トラック グレード 1　の編集"
@@ -13802,5 +13819,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr "トラック グレード 2"
@@ -13809,5 +13826,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr "トラック グレード 2の編集"
@@ -13815,5 +13832,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr "トラック グレード 3"
@@ -13822,5 +13839,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr "トラック グレード 3　の編集"
@@ -13828,5 +13845,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr "トラック グレード 4"
@@ -13835,5 +13852,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr "トラック グレード 4　の編集"
@@ -13841,5 +13858,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr "トラック グレード 5"
@@ -13848,5 +13865,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr "トラック グレード 5 の編集"
@@ -13855,5 +13872,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr "小道"
@@ -13862,13 +13879,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr "小道の編集"
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr "スノーモービル"
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr "スキー"
@@ -13876,5 +13893,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr "ハイキング"
@@ -13884,5 +13901,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr "ハイキングの編集"
@@ -13890,5 +13907,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr "山岳ハイキング"
@@ -13898,5 +13915,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr "山岳ハイキングの編集"
@@ -13904,5 +13921,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr "厳しい山岳ハイキング"
@@ -13912,5 +13929,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr "厳しい山岳ハイキングの編集"
@@ -13918,5 +13935,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr "高山ハイキング"
@@ -13926,5 +13943,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr "高山ハイキングの編集"
@@ -13932,5 +13949,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr "厳しい高山ハイキング"
@@ -13940,5 +13957,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr "厳しい高山ハイキングの編集"
@@ -13946,5 +13963,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr "困難な高山ハイキング"
@@ -13954,5 +13971,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr "困難な高山ハイキングの編集"
@@ -13960,10 +13977,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr "ウェイポイント"
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr "高速道路のジャンクション"
@@ -13971,15 +13988,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr "高速道路ジャンクションの編集"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr "数"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr "サービス"
@@ -13987,5 +14004,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr "サービスステーションの編集"
@@ -14020,14 +14037,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr "操作員"
@@ -14036,5 +14053,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr "信号機"
@@ -14044,5 +14061,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr "横断歩道タイプ"
@@ -14051,27 +14068,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr "マークだけ"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr "信号機"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr "途中に島あり"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr "マークなし"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr "馬用横断道"
@@ -14079,6 +14096,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr "自転車用横断歩道"
@@ -14087,11 +14104,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr "踏切係員"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr "踏切タイプ名(UK)"
@@ -14099,30 +14116,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr "横断歩道"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr "ペリカン柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr "Toucan柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr "ツノメドリ"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr "ペガサス柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr "虎縞柄横断歩道（ＵＫ）"
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr "停止"
@@ -14130,5 +14147,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr "横断歩道"
@@ -14137,14 +14154,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr "踏切の編集"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr "タイプ名(UK)"
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr "小さなラウンドアバウト"
@@ -14155,14 +14172,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr "方向"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr "時計回り"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr "転回場"
@@ -14172,20 +14189,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr "市境界標識"
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr "市境界標識の編集"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr "二つ目の名前"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr "スピードカメラ（オービス）"
@@ -14193,5 +14210,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr "緊急電話"
@@ -14199,5 +14216,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr "坂"
@@ -14205,5 +14222,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr "急な坂"
@@ -14212,10 +14229,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr "浅瀬（洗い越し）"
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr "浅瀬（歩いて渡る）"
@@ -14223,5 +14240,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr "峠道"
@@ -14229,5 +14246,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr "峠道の編集"
@@ -14239,7 +14256,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr "高度"
@@ -14247,5 +14264,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr "ゲート等"
@@ -14253,5 +14270,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr "車止め杭"
@@ -14259,5 +14276,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr "bollardの編集"
@@ -14296,18 +14313,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr "許可された通行："
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr "自転車止め"
@@ -14316,5 +14337,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr "ブロック"
@@ -14323,5 +14344,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr "Cattle Grid(家畜用格子柵)"
@@ -14329,5 +14350,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr "Cattle Gridの編集"
@@ -14335,5 +14356,5 @@
 # http://en.wikipedia.org/wiki/Bus_trap
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr "バスだけが通行可能になる落とし穴"
@@ -14341,15 +14362,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr "車止めのとげ"
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr "車止めのとげの編集"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr "料金所"
@@ -14357,5 +14378,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr "料金所の編集"
@@ -14363,10 +14384,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr "国境検査所"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr "国境検査所の編集"
@@ -14376,5 +14397,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr "生け垣"
@@ -14383,5 +14404,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr "フェンス"
@@ -14390,5 +14411,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr "壁"
@@ -14396,5 +14417,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr "城壁"
@@ -14403,5 +14424,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr "擁壁"
@@ -14413,15 +14434,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr "入口"
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr "入り口の編集"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr "ゲート"
@@ -14429,50 +14450,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr "ゲートの編集"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr "引き上げゲート"
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr "引き上げゲートの編集"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr "Hampshire Gate"
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr "Hampshire Gateの編集"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr "竹のゲート"
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr "竹のゲートの編集"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr "幅の狭いゲート"
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr "幅の狭いゲートの編集"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr "踏み越し段"
@@ -14480,15 +14501,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr "Stileの編集"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+#, fuzzy
+msgid "Turnstile"
+msgstr "転車台（ターンテーブル）"
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "Stileの編集"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr "城の出撃路"
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr "城の出撃路の編集"
@@ -14499,10 +14532,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr "水域(湖沼)"
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr "泉"
@@ -14510,5 +14543,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr "泉の編集"
@@ -14516,5 +14549,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr "側溝"
@@ -14522,10 +14555,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr "川(drain)の編集"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr "小川"
@@ -14533,10 +14566,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr "小川の編集"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr "運河"
@@ -14544,10 +14577,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr "運河の編集"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr "川"
@@ -14557,5 +14590,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr "河川の編集"
@@ -14563,15 +14596,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr "水域の編集"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr "陸"
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr "陸の編集"
@@ -14579,5 +14612,5 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr "水たまり、窪地"
@@ -14585,10 +14618,10 @@
 # 水たまりになるような土地
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr "窪地、水盤場の盆地"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr "ため池"
@@ -14596,15 +14629,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr "ため池の編集"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr "蓋付きため池"
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr "蓋のされたため池の編集"
@@ -14612,5 +14645,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr "川岸"
@@ -14619,10 +14652,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr "川岸の編集"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr "湿地帯"
@@ -14633,14 +14666,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr "湿地帯の編集"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr "沼地"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr "湿地"
@@ -14654,35 +14687,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr "沼地、湿地"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr "葦原"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr "塩湖"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr "干潟"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr "マングローブ"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr "泥地"
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr "泥地の編集"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr "砂浜"
@@ -14690,20 +14723,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr "砂浜の編集"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr "湾"
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr "湾の編集"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr "崖"
@@ -14711,10 +14744,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr "崖の編集"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr "海岸線"
@@ -14722,5 +14755,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr "海岸線の編集"
@@ -14728,5 +14761,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr "フェリー航路"
@@ -14734,5 +14767,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr "フェリー航路の編集"
@@ -14741,5 +14774,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr "ボートヤード"
@@ -14747,10 +14780,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr "船着き場の編集"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr "ドック"
@@ -14758,5 +14791,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr "ドックの編集"
@@ -14764,5 +14797,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr "ダム"
@@ -14770,15 +14803,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr "ダムの編集"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr "水路ポイント"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr "ロックゲート"
@@ -14787,5 +14820,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr "堰"
@@ -14793,20 +14826,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr "ダムの編集"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr "滝"
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr "滝の編集"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr "転回地点"
@@ -14815,15 +14848,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr "マリーナ"
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr "マリーナの編集"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr "桟橋"
@@ -14831,10 +14864,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr "桟橋の編集"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr "フェリーターミナル"
@@ -14842,10 +14875,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr "フェリーターミナルの編集"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr "造船台"
@@ -14855,5 +14888,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr "造船台の編集"
@@ -14861,10 +14894,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr "鉄道"
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr "線路"
@@ -14872,5 +14905,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr "線路の編集"
@@ -14900,8 +14933,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr "追加のタイプ"
@@ -14915,35 +14948,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr "中庭"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr "待避線"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr "分岐線"
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr "トロッコ線路（狭軌）"
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr "トロッコ線路（狭軌）の編集"
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr "モノレール"
@@ -14951,45 +14984,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr "モノレールの編集"
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr "保存鉄道"
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr "保存鉄道の編集"
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr "路面電車（ライトレール）"
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr "路面電車（ライトレール）の編集"
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr "地下鉄"
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr "地下鉄の編集"
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr "路面電車（トラム）"
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr "路面電車（トラム）の編集"
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr "バスレーン"
@@ -14997,5 +15030,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr "バス車線の編集"
@@ -15004,14 +15037,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr "使われていない線路"
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr "使われていない線路の編集"
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr "廃棄された線路"
@@ -15020,5 +15053,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr "踏切"
@@ -15027,5 +15060,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr "踏切（遮断機なし）"
@@ -15035,5 +15068,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr "踏切のタイプ"
@@ -15041,5 +15074,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr "転車台（ターンテーブル）"
@@ -15048,10 +15081,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr "リフト"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr "いすリフト"
@@ -15059,10 +15092,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr "いすリフトの編集"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr "Tバーリフト"
@@ -15070,10 +15103,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr "Tバーリフト"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr "ケーブルカー"
@@ -15081,10 +15114,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr "ケーブルカーの編集"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr ""
@@ -15092,5 +15125,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr ""
@@ -15098,5 +15131,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr "駅"
@@ -15107,10 +15140,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr "駅の編集"
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr "ガソリンスタンド"
@@ -15120,5 +15153,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr "ガソリンスタンドの編集"
@@ -15134,5 +15167,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15142,5 +15175,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr "駐車場の編集"
@@ -15148,41 +15181,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr "収容台数"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr "表面"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr "多階の建物"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr "地下"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr "パーク＆ライド"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr "障がい者用スペース"
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr "料金"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr "洗車場"
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr "洗車場の編集"
@@ -15190,5 +15223,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr "自動車パーツショップ"
@@ -15196,15 +15229,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr "自動車パーツショップの編集"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr "自動車修理"
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr "自動車修理工場の編集"
@@ -15212,5 +15245,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr "レンタル"
@@ -15219,10 +15252,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr "レンタカーの編集"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr "自家用車共有"
@@ -15230,5 +15263,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr "カーシェアリング"
@@ -15236,5 +15269,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr "駐輪場の編集"
@@ -15243,5 +15276,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr "自転車レンタルの編集"
@@ -15250,15 +15283,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr "自転車ショップの編集"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "公共交通機関"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -15266,5 +15299,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr "停車場"
@@ -15272,5 +15305,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr "停止線の編集"
@@ -15278,5 +15311,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr "トラム停車場"
@@ -15285,5 +15318,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr "トラム停車場の編集"
@@ -15291,5 +15324,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr "鉄道のプラットホーム"
@@ -15298,5 +15331,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr "鉄道のプラットホームの編集"
@@ -15308,5 +15341,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr "リファレンス (ホームの番号)"
@@ -15314,10 +15347,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr "エリア"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr "地下鉄の入口"
@@ -15326,10 +15359,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr "地下鉄入口の編集"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr "車いす"
@@ -15338,5 +15371,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr "バスターミナル"
@@ -15345,5 +15378,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr "バスターミナルの編集"
@@ -15351,5 +15384,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr "バス停"
@@ -15359,5 +15392,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr "バス停の編集"
@@ -15368,6 +15401,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr "避難所"
@@ -15375,10 +15408,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr "バス乗り場"
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr "バス乗り場の編集"
@@ -15386,5 +15419,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr "タクシー"
@@ -15392,5 +15425,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr "タクシー乗り場の編集"
@@ -15398,5 +15431,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr "空港"
@@ -15404,15 +15437,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr "空港の編集"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr "ICAO"
@@ -15421,5 +15454,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr "宿泊施設"
@@ -15431,5 +15464,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "ホテル"
@@ -15438,15 +15471,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr "ホテルの編集"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr "星の数"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr "モーテル"
@@ -15454,20 +15487,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr "モーテルの編集"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr "ゲストハウス"
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr "ゲストハウスの編集"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr "シャレー風の別荘、シャレー"
@@ -15475,10 +15508,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr "シャレー風の別荘の編集"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr "ホステル"
@@ -15486,30 +15519,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr "ホステルの編集"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr "山小屋"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr "山小屋の編集"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr "ハウストレーラー用駐車場"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr "ハウストレーラー用駐車場の編集"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr "キャンプ場"
@@ -15517,10 +15550,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr "キャンプ場の編集"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "飲食店"
@@ -15531,5 +15564,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "レストラン"
@@ -15537,5 +15570,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr "レストランの編集"
@@ -15543,5 +15576,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr "料理の種類"
@@ -15549,61 +15582,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr "イタリアン"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr "中国料理"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr "ピザ"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr "バーガー"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr "ギリシャ料理"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr "ドイツ料理"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr "インド料理"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr "郷土料理"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr "カバブ"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr "トルコ料理"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr "アジア各国料理"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr "タイ料理"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr "メキシコ料理"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr "日本食"
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr "ファーストフード"
@@ -15611,9 +15644,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr "ファーストフード店の編集"
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr "カフェ"
@@ -15621,10 +15654,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr "カフェの編集"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr "パブ、居酒屋"
@@ -15632,20 +15665,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr "パブの編集"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr "ビアガーデン"
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr "ビアガーデンの編集"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr "バー"
@@ -15653,10 +15686,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr "バーの編集"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr "ナイトクラブ"
@@ -15664,20 +15697,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr "ナイトクラブの編集"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "旅行"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr "アトラクション"
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr "アトラクションの編集"
@@ -15686,11 +15719,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr "営業時間"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "博物館"
@@ -15698,10 +15731,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr "博物館の編集"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "動物園"
@@ -15710,10 +15743,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr "動物園の編集"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr "観覧台"
@@ -15721,25 +15754,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr "View pointの編集"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr "テーマパーク"
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr "テーマパークの編集"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr "美術館"
@@ -15747,5 +15780,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr "美術館の編集"
@@ -15753,5 +15786,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr "案内所"
@@ -15759,80 +15792,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr "案内所の編集"
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "マップ"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr "マップタイプ"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr "マップ"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr "街路地図"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr "ハイキングマップ"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr "自転車マップ"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
 msgid "Closer Description"
 msgstr ""
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1701
 msgid "Information Board"
 msgstr "情報板"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Board Type"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "board"
 msgstr "board"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "history"
 msgstr "ヒストリー"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "nature"
 msgstr "自然"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "wildlife"
 msgstr "野生生物"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Guidepost (Hiking)"
 msgstr "ガイドポスト(ハイキング)"
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr "その他の情報ポイント"
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr "シェルターの編集"
@@ -15840,25 +15873,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr "野外炉"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr "ピクニック場(野外調理場)"
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr "ピクニック場の編集"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "史跡"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "城"
@@ -15867,20 +15900,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr "城の編集"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "遺跡"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr "遺跡(ruins)の編集"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr "遺跡（群）"
@@ -15889,10 +15922,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr "遺跡（群）の編集"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr "戦場"
@@ -15900,5 +15933,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr "戦場の編集"
@@ -15906,15 +15939,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr "記念塔(モニュメント)"
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr "モニュメントの編集"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr "記念碑(戦争記念などの)"
@@ -15922,45 +15955,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr "記念碑の編集"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr "道路際の十字架"
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr "道路際の十字架の編集"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr "道祖神"
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr "道祖神の編集"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "レジャー"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr "親水公園"
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr "親水公園の編集"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "遊び場"
@@ -15968,15 +16001,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr "運動公園の編集"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "つり"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr "つりの編集"
@@ -15984,15 +16017,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr "スポーツ施設"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "スタジアム"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr "スタジアムの編集"
@@ -16006,6 +16039,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "スポーツ選択："
@@ -16028,4 +16061,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -16086,5 +16127,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16094,5 +16143,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16238,5 +16287,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16342,5 +16391,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16381,29 +16430,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr "スポーツ"
@@ -16413,227 +16463,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr "多目的"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr "アーチェリー"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr "アスレチック"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr "オーストラリアフットボール"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr "野球"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr "バスケットボール"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr "ペタンク"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr "ボーリング"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr "カヌー"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr "登山"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr "クリケット"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr "クリケットネット"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr "クローク"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr "サイクリング"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr "ドッグレース"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr "乗馬"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr "フットボール"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr "ゴルフ"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr "体操"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr "ホッケー"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr "競馬"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr "モータースポーツ"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr "ペロタ"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr "ラケットボール"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr "ラグビー"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr "射撃"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr "スケートボード"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr "スケート"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr "スキー"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "サッカー"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr "水泳"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "卓球"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr "テニス"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr "スポーツセンター"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr "スポーツセンターの編集"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr "運動場"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr "運動場の編集"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr "競技トラック"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr "競技場のトラックの編集"
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr "ゴルフコース"
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr "ゴルフコースの編集"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr "ミニチュアゴルフ"
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr "ミニチュアゴルフの編集"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr "スポーツ"
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr "多目的"
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr "Multiの編集"
@@ -16672,191 +16722,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr "運動場"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr "スポーツセンター"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr "スタジアム"
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr "テンピンズ"
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr "テンピンズの編集"
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr "アスレチック"
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr "アスレチック場の編集"
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr "アーチェリー"
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr "アーチェリーの編集"
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr "登山"
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr "登山の編集"
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr "カヌー・競艇"
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr "競艇場の編集"
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr "サイクリング"
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr "サイクリングの編集"
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr "ドッグレース"
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr "ドックレースの編集"
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr "乗馬"
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr "乗馬の編集"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr "競馬"
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr "競馬場の編集"
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr "体操"
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr "体操競技の編集"
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr "モータースポーツ"
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr "モータースポーツの編集"
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr "スケート"
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr "スケート場の編集"
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr "スケートボード"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr "スケートボードの編集"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr "水泳"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr "水泳の編集"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr "スキー"
@@ -16864,56 +16914,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr "スキーの編集"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr "ゲレンデのタイプ"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr "ダウンヒル"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr "ノルディックスキー"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr "スノーパーク"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr "難易度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr "初心者"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr "初球"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr "エキスパート"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr "ただ乗り"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr "射撃"
@@ -16921,127 +16971,127 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr "射撃の編集"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr "球技"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr "サッカー"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr "サッカー場の編集"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr "フットボール"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr "フットボール場の編集"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr "オーストラリアフットボール"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr "オーストラリアフットボールの編集"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr "野球"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr "野球場の編集"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr "バスケットボール"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr "バスケットボール場の編集"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr "ゴルフ"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr "ゴルフの編集"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr "ゴルフコース"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr "ペタンク"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr "（ペタンクの）ブールの編集"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr "ボーリング"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr "ボーリング場の編集"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr "クリケット"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr "クリケットの編集"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr "クリケットネット"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr "クリケットネットの編集"
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr "クロッケー"
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr "クロッケーの編集"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr "ホッケー"
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr "ホッケーの編集"
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr "ペロタ"
@@ -17049,51 +17099,51 @@
 #  ペロタ 《スペイン・南米・フィリピンなどで行なわれる球技; ハイアライ (jai alai) に発展》.
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr "ペロタの編集"
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr "ラケットボール"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr "ラケットボールの編集"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr "ラグビー"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr "ラグビー場の編集"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr "卓球"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr "卓球の編集"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr "テニス"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr "テニスの編集"
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "ビル"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr "ビル"
@@ -17101,5 +17151,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "公共のビル"
@@ -17107,10 +17157,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr "公共のビルの編集"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "役場"
@@ -17118,10 +17168,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "役場の編集"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "大使館"
@@ -17129,10 +17179,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "大使館の編集"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "裁判所"
@@ -17141,10 +17191,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "裁判所の編集"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "刑務所"
@@ -17153,10 +17203,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "刑務所の編集"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "警察"
@@ -17166,10 +17216,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "警察署・交番の編集"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "消防署"
@@ -17178,10 +17228,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "消防署の編集"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "郵便局"
@@ -17189,5 +17239,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr "郵便局の編集"
@@ -17195,15 +17245,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr "幼稚園の編集"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "学校"
@@ -17211,10 +17261,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "学校の編集"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr "大学"
@@ -17222,10 +17272,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr "大学の編集"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr "短大"
@@ -17233,5 +17283,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr "短大の編集"
@@ -17239,5 +17289,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "映画館"
@@ -17246,10 +17296,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "映画館の編集"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "図書館"
@@ -17258,10 +17308,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "図書館の編集"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr "美術館"
@@ -17269,10 +17319,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr "美術館の編集"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "劇場"
@@ -17281,10 +17331,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "劇場の編集"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr "礼拝所"
@@ -17294,5 +17344,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr "礼拝所の編集"
@@ -17301,6 +17351,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr "宗教"
@@ -17309,66 +17359,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr "バハーイ教"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr "仏教"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr "キリスト教"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr "ヒンズー教"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr "ジャイナ教"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr "ユダヤ教"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr "ムスリム"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr "シーク教"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr "降霊術士、イタコ"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr "ゾロアスター教"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr "宗派"
@@ -17377,81 +17427,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr "英国教会系"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr "バプチスト"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr "カトリック"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr "福音派"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr "ものみの塔、エホバの証人"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr "ルター派"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr "メソジスト派"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr "モルモン"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr "ギリシャ正教系"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr "ペンテコステ派"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr "長老派"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr "プロテスタント"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr "クエーカー教徒"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr "シーア派"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr "スンニ派"
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr "住所"
@@ -17460,5 +17510,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr "住所情報の編集"
@@ -17466,5 +17516,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr "いえ番号"
@@ -17472,20 +17522,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr "家の名前"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr "都市名"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "郵便番号"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr "国コード"
@@ -17493,5 +17543,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr "住所の補間"
@@ -17500,5 +17550,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr "住所の補間を編集"
@@ -17506,71 +17556,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr "番地付けルール"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr "奇数"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr "偶数"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr "全て"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr "人工物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr "工場"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr "工場の編集"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "タワー"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "タワーの編集"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "水道塔"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "水道塔の編集"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr "ガスタンク"
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr "ガスタンクの編集"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "灯台"
@@ -17578,10 +17628,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "灯台の編集"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "風車"
@@ -17589,10 +17639,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "風車の編集"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "パイプライン"
@@ -17600,10 +17650,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "パイプラインの編集"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr "下水処理場"
@@ -17613,10 +17663,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr "下水処理場の編集"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr "クレーン"
@@ -17624,10 +17674,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr "クレーンの編集"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr "ビーコン"
@@ -17635,10 +17685,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr "誘導灯の編集"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr "調査ポイント"
@@ -17646,10 +17696,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr "測点の編集"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr "監視カメラ"
@@ -17657,5 +17707,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr "監視カメラの編集"
@@ -17663,5 +17713,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr "発電機"
@@ -17671,39 +17721,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr "発電機の編集"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr "風"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr "水力発電"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr "火力発電"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr "原子力"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr "石炭"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr "太陽光発電"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr "ガス"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr "変電所"
@@ -17712,10 +17762,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr "変電所の編集"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr "発電サブステーション"
@@ -17724,5 +17774,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr "配電所の編集"
@@ -17730,10 +17780,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr "送電塔"
@@ -17744,5 +17794,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr "送電塔の編集"
@@ -17750,5 +17800,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr "送電線"
@@ -17757,25 +17807,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr "送電線の編集"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr "電圧"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr "ワイヤー量"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr "各種設備"
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "トイレ"
@@ -17783,20 +17833,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr "参照番号"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr "備考"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr "郵便ポスト"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "電話"
@@ -17805,5 +17855,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr "電話を編集"
@@ -17811,5 +17861,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "コイン"
@@ -17817,5 +17867,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr "備考"
@@ -17823,5 +17873,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr "電子マネー"
@@ -17829,5 +17879,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr "デビットカード"
@@ -17835,15 +17885,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "クレジットカード"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "テレフォンカード"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr "リサイクル"
@@ -17852,5 +17902,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr "リサイクルステーションの編集"
@@ -17858,35 +17908,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr "バッテリー"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr "カン"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr "被服"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr "ガラス"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr "紙"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr "スクラップ金属"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr "ベンチ"
@@ -17895,20 +17945,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr "Hunting Standの編集"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr "隠す"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr "ロック"
@@ -17916,22 +17966,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr "高さ"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr "低い"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr "半分"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr "完全"
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr "噴水"
@@ -17940,10 +17990,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr "噴水の編集"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "飲料水"
@@ -17952,10 +18002,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "飲料水の編集"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr "赤ちゃんポスト"
@@ -17963,25 +18013,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr "赤ちゃんポストの編集"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "店舗"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr "スーパーマーケット"
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr "スーパーマーケットの編集"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr "コンビニエンスストア"
@@ -17989,10 +18039,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr "コンビニの編集"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr "キオスク"
@@ -18000,10 +18050,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr "キオスクの編集"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "自動販売機"
@@ -18011,5 +18061,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "自動販売機の編集"
@@ -18017,88 +18067,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "自動販売機"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr "公共_交通_チケット"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr "パーキングチケット"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr "食料"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "飲料"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr "甘味"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr "たばこ"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr "写真"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr "ペットフード"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "新聞"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "おもちゃ"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr "切手"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "携帯の契約"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr "プリペイド携帯のチャージ"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr "車"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr "コンドーム"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr "タンポン"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "精肉店"
@@ -18106,10 +18156,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "精肉店の編集"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "パン屋"
@@ -18117,10 +18167,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "パン屋の編集"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr "生花店"
@@ -18128,20 +18178,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr "生花店の編集"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr "オーガニック"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr "オーガニック（有機）ショップの編集"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr ""
@@ -18149,60 +18199,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr ""
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr "飲料店"
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr ""
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr "コンピュータ店"
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr "コンピュータ店の編集"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr "家電店"
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr "家電店の編集"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr "オーディオショップ"
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr "オーディオショップの編集"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr "家具店"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr "家具店の編集"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr "園芸用品店"
@@ -18210,10 +18260,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr "園芸用品店の編集"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr "金物屋"
@@ -18221,10 +18271,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr "金物屋の編集"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr "DIYショップ"
@@ -18232,60 +18282,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr "DIYショップの編集"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr "文具店"
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr "文具店の編集"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr "美容院"
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr "美容院の編集"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr "靴店"
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr "靴店の編集"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr "おもちゃ屋"
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr "おもちゃ屋の編集"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr "ビデオ"
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr "ビデオショップの編集"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "クリーニング店"
@@ -18293,10 +18343,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "クリーニング店の編集"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "ランドリー"
@@ -18304,10 +18354,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "ランドリーの編集"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr "アウトドア店"
@@ -18315,35 +18365,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr "アウトドア店の編集"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr "スポーツ店"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr "眼鏡屋の編集"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "お金"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "銀行"
@@ -18351,5 +18401,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "銀行の編集"
@@ -18357,10 +18407,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "ATM"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr "両替"
@@ -18368,5 +18418,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr "両替の編集"
@@ -18374,15 +18424,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "ATMの編集"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "健康"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr "医院"
@@ -18390,20 +18440,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr "医院の編集"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr "歯科医院"
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr "歯科医院の編集"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "薬局"
@@ -18411,5 +18461,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "薬局の編集"
@@ -18417,10 +18467,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr "調剤薬局"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "病院"
@@ -18428,10 +18478,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "病院の編集"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr "夜間急病センター"
@@ -18440,5 +18490,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr "夜間急病センターの編集"
@@ -18447,20 +18497,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr "ポイント数"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr "ポイント名"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr "電話番号"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(+81-3-3345-6789のような国際で通用する電話番号を使ってください)"
@@ -18468,5 +18518,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr "動物病院"
@@ -18475,56 +18525,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr "動物病院の編集"
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr "大陸"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr "大陸の編集"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr "国(country)"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr "国(country)の編集"
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr "州(state)"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr "州(state)の編集"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr "地方"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr "地方の編集"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr "郡"
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr "郡の編集"
@@ -18532,15 +18581,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr "市区"
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr "市区の編集"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr "町"
@@ -18548,10 +18597,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr "町の編集"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr "近郊住宅地"
@@ -18559,25 +18608,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr "近郊住宅地の編集"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "村"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "村の編集"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr "小村落"
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr "小村落の編集"
@@ -18585,5 +18634,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr "地域"
@@ -18591,10 +18640,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr "地域の編集"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "島"
@@ -18602,5 +18651,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "島の編集"
@@ -18608,5 +18657,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr "洞窟の入口"
@@ -18614,10 +18663,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr "洞窟の入口の編集"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "山頂"
@@ -18625,10 +18674,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "山頂の編集"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr "氷河"
@@ -18636,10 +18685,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr "氷河の編集"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr "火山"
@@ -18647,70 +18696,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr "火山の編集"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr "境界線"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr "国境"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr "国境の編集"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr "行政区画"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr "行政区画の編集"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr "Civil境界"
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr "Civil境界の編集"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr "地点名"
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr "Political境界の編集"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr "国立公園"
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr "国立公園の境界編集"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "樹木・林"
@@ -18719,15 +18768,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "樹木・林の編集"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr "植物の名前"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr "森"
@@ -18736,5 +18785,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr "森の編集"
@@ -18742,17 +18791,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr "針葉樹"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr "広葉樹"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr "混合林"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "森"
@@ -18761,14 +18810,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr "森の編集"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr "自然保護区"
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr "自然保護区の編集"
@@ -18776,25 +18825,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr "ガレ場"
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr "ガレ場の編集"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr "低木林"
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr "低木林の編集"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr "山(Fell)"
@@ -18802,10 +18851,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr "山(Fell)の編集"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr "荒れ地"
@@ -18813,5 +18862,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr "荒れ地の編集"
@@ -18819,5 +18868,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr "農家の庭"
@@ -18826,45 +18875,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr "農家の庭の編集"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr "農地"
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr "農地の編集"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr "牧草地"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr "牧草地の編集"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr "ぶどう園"
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr "ぶどう園の土地利用の編集"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr "貸し農園"
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr "家庭菜園用地の編集"
@@ -18872,25 +18921,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr "庭園"
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr "庭園の編集"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr "草地"
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr "草地の編集"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr "里山"
@@ -18898,10 +18947,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr "里山利用区画の編集"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr "共有地"
@@ -18909,20 +18958,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr "共有地の名前"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr "公園"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr "公園の編集"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr "レクレーション広場"
@@ -18930,5 +18979,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr "レクレーション広場利用区画の編集"
@@ -18936,15 +18985,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr "住宅エリア"
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr "住宅用地の編集"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr "墓所"
@@ -18952,9 +19001,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr "（教会・寺院にある）墓所の編集"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr "共同墓地"
@@ -18962,39 +19011,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr "共同墓地の編集"
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr "小売り商業"
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr "小売商用地の編集"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr "商用"
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr "商用地の編集"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr "工業"
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr "工業地の編集"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr "鉄道用地"
@@ -19002,15 +19051,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr "鉄道用地の編集"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr "軍用"
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr "軍用地の編集"
@@ -19018,55 +19067,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr "工事中エリア"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr "工事中用地の編集"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr "利用されなくなった商業設備"
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr "利用されなくなった工業地の編集"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr "未開発工業地"
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr "緑地の編集"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr "埋め立てゴミ処理地"
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr "埋め立てゴミ処理地の編集"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr "採石場"
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr "採石場の編集"
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr "マルチポリゴン"
@@ -19076,5 +19125,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr "マルチポリゴンを編集"
@@ -19083,10 +19132,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr "外側のセグメント"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr "内側のセグメント"
@@ -19094,5 +19143,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr "右左折制限"
@@ -19101,5 +19150,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr "右左折制限の編集"
@@ -19107,34 +19156,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr "通行制限"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr "左折禁止"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr "右折禁止"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr "直進禁止"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr "Uターン禁止"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr "右折のみ"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr "左折のみ"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr "直進のみ"
@@ -19143,15 +19192,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr "ウエイから"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr "ノードかウェイを経由して"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr "ウエイへ"
@@ -19159,5 +19208,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr "ルート"
@@ -19166,5 +19215,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr "ルート編集"
@@ -19172,5 +19221,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr "ルート種類"
@@ -19242,24 +19291,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr "自転車"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr "バス"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr "道"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr "フェリー"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr "スキー"
@@ -19312,20 +19361,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr "徒歩"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr "ハイキング"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr "トラム"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr "迂回路"
@@ -19339,10 +19388,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr "地下鉄"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr "シンボルの説明"
@@ -19350,26 +19399,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr "ネットワーク"
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "ルート種類"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr "案"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr "代替路"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr "一時的"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr "接続"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr "色 (16進法)"
@@ -19378,30 +19433,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr "ルートセグメント"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr "前のセグメント"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr "後方セグメント"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr "停止点"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr "前方の停止点"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr "後方の停止点"
@@ -19437,6 +19492,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19452,5 +19508,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19469,5 +19533,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr "標準"
@@ -19561,7 +19625,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr "橋"
@@ -19826,15 +19890,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr "破棄された"
@@ -19876,5 +19940,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr "馬"
@@ -20012,4 +20076,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20021,5 +20091,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20027,5 +20097,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20062,5 +20132,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20084,11 +20154,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr ""
@@ -20112,5 +20182,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20151,5 +20221,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20187,6 +20257,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr "ストリート"
@@ -20242,7 +20312,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr "車線"
@@ -20295,11 +20365,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr "線路"
@@ -20320,5 +20398,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr ""
@@ -20332,5 +20410,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr ""
@@ -20351,5 +20429,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr "転回所"
@@ -20363,6 +20441,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr ""
@@ -20377,5 +20455,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr "川岸"
@@ -20389,5 +20467,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr "小川"
@@ -20401,5 +20479,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr "ドック"
@@ -20427,5 +20505,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr "水道"
@@ -20568,5 +20646,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20593,13 +20671,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr "人工物"
@@ -20661,7 +20739,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr ""
@@ -20684,10 +20762,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr "その他の軌道"
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr ""
@@ -20723,7 +20801,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr "古い軌道"
@@ -20768,6 +20846,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr "空路"
@@ -20781,5 +20859,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr "駅"
@@ -20801,5 +20879,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr "空路（暗色）"
@@ -20813,5 +20891,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr "空路（明色）"
@@ -20819,4 +20897,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20859,7 +20944,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr "リフト"
@@ -20876,5 +20961,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr "初球者スキーコース"
@@ -20889,5 +20974,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr "中級者スキーコース"
@@ -20902,5 +20987,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr "上級者スキーコース"
@@ -20915,5 +21000,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr "熟練者用のゲレンデ"
@@ -20928,5 +21013,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr "フリースタイルのゲレンデ"
@@ -20941,5 +21026,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr "初心者スキーゲレンデ"
@@ -20962,4 +21047,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -20970,4 +21062,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -21044,10 +21144,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr "電力"
@@ -21061,5 +21162,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr "桟橋"
@@ -21073,5 +21174,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr "パイプライン"
@@ -21199,12 +21300,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr "レジャー"
@@ -21218,5 +21319,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr "マリーナ"
@@ -21288,8 +21389,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr "アメニティ"
@@ -21391,10 +21492,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr "アメニティ_交通"
@@ -21414,4 +21515,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21433,4 +21541,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21754,4 +21869,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -21778,24 +21901,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr "アメニティ_信号"
@@ -21827,6 +21958,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr "信号_水域"
@@ -21887,8 +22018,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr "健康"
@@ -22241,26 +22372,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr "店"
@@ -22315,5 +22446,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22332,8 +22463,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr "ホテル"
@@ -22483,9 +22614,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr "旅行関係"
@@ -22557,8 +22688,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr "史跡"
@@ -22629,8 +22760,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr "緑"
@@ -22644,5 +22775,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr "石切り場"
@@ -22656,5 +22787,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr "埋め立て地"
@@ -22676,5 +22807,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr "水たまり、窪地"
@@ -22688,5 +22819,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr "森"
@@ -22700,5 +22831,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr "農地"
@@ -22721,5 +22852,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr "小売りの商用地"
@@ -22733,5 +22864,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr "工業地"
@@ -22745,5 +22876,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr "使用していない工業地"
@@ -22757,5 +22888,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr "緑地"
@@ -22769,5 +22900,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr "鉄道公園"
@@ -22824,7 +22955,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr "軍用地"
@@ -22838,5 +22969,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr "墓地"
@@ -22849,5 +22980,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr "山頂"
@@ -22862,5 +22993,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr "氷河"
@@ -22874,5 +23005,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr "火山"
@@ -22927,8 +23058,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr "自然"
@@ -22942,5 +23073,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr "低木"
@@ -22954,5 +23085,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr "荒地"
@@ -22966,5 +23097,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr "森"
@@ -22978,5 +23109,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr "泥"
@@ -22990,5 +23121,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr "砂浜"
@@ -23066,8 +23197,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr "ルート"
@@ -23115,7 +23246,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr "行政区境"
@@ -23257,10 +23388,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr "場所"
@@ -23308,6 +23439,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr "住所"
@@ -23604,18 +23735,6 @@
 msgstr ""
 
-#~ msgid "Unknown file extension."
-#~ msgstr "ファイルの拡張子が不明です"
-
 #~ msgid "Move"
 #~ msgstr "移動"
-
-#~ msgid "Invalid projection"
-#~ msgstr "投影法が無効"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "最初に投影法を {0} に変えてください。"
-
-#~ msgid "end"
-#~ msgstr "終了"
 
 #~ msgid "Data Layer"
@@ -23734,4 +23853,7 @@
 #~ msgstr "TCXファイルをインポート"
 
+#~ msgid "end"
+#~ msgstr "終了"
+
 #~ msgid "image not loaded"
 #~ msgstr "画像が読み込まれていません。"
@@ -23796,4 +23918,7 @@
 #~ msgid "resolved version:"
 #~ msgstr "解決したバージョン:"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "ファイルの拡張子が不明です"
 
 #~ msgid "Import TCX file as GPS track"
@@ -23950,4 +24075,10 @@
 #~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>もしくは<A HREF=\"{1}\">"
 #~ "あなたの母国語</A>でそれを作成してください。"
+
+#~ msgid "Invalid projection"
+#~ msgstr "投影法が無効"
+
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "最初に投影法を {0} に変えてください。"
 
 #~ msgid "Directly load TCX files from JOSM."
Index: /applications/editors/josm/i18n/po/nb.po
===================================================================
--- /applications/editors/josm/i18n/po/nb.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/nb.po	(revision 17069)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
-"PO-Revision-Date: 2009-08-04 11:11+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
+"PO-Revision-Date: 2009-08-15 11:22+0000\n"
+"Last-Translator: Skippern <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-10 11:58+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -56,6 +56,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -100,6 +100,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "Feil"
@@ -110,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "Ulagrede endringer"
@@ -128,10 +128,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -148,15 +148,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -186,6 +186,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -215,5 +215,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -325,5 +325,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
 msgid "License"
-msgstr ""
+msgstr "Lisens"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
@@ -372,7 +372,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
-msgstr ""
+msgstr "Flett"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
@@ -454,9 +454,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -489,7 +489,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -575,37 +575,37 @@
 msgstr "{0} noder i linje {1} overstiger maksimalt antall tillatte noder, {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "utvalg"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "last ned"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Gå til {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Skaler og flytt skjermbildet til {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -615,30 +615,30 @@
 msgstr "Bilde: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "Inet utvalg å vise."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "Ingen konflikter å vise."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "Sammenføy linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "Sammenføy flere linjer til én"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "Velg minst to linjer å sammenføye."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr "Sammenføye linjer med forskjellig tilhørighet?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -646,13 +646,13 @@
 msgstr "Vil du virkelig sammenføye linjer med forskjellig tilhørighet?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "Sammenføy uansett"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "Endre retninger?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -662,10 +662,10 @@
 "retningen på noen av linjene?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "Snu og sammenføy"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -673,20 +673,20 @@
 msgstr "Legg inn verdier for alle konflikter."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Løs konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Sammenføy {0} linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "Alle linjene var tomme"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -719,5 +719,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 msgid "Those nodes are not in a circle. Aborting."
-msgstr ""
+msgstr "Disse nodene er ikke i en sirkel. Avbryter."
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -733,6 +733,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -754,6 +754,6 @@
 msgstr "Slett valgte objekter."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -763,5 +763,5 @@
 msgstr "Skriv over"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -818,5 +818,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42
 msgid "Download referrers..."
-msgstr ""
+msgstr "Last ned referansene ..."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
@@ -893,7 +893,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "Eksporter dataene til GPX-fil."
+msgstr "Eksporter GPX fil"
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -909,5 +908,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -925,5 +924,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -991,28 +990,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
 msgid "Merge layer"
-msgstr ""
+msgstr "Flett lag"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
 msgid "Merge the current layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+msgstr "Flett det gjeldende laget inn i et annet lag"
+
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "Samle noder"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "Samle noder i den eldste"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "Velg minst to noder til å samle"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr "Samle noder med forskjellige relasjoner?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1022,13 +1021,13 @@
 "samle noder?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "Samle noder allikevel"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "Kan ikke samle noder. Ville ha måttet slette en linje som er i bruk."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1038,5 +1037,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 msgid "Merge selection"
-msgstr ""
+msgstr "Flett utvalgte"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
@@ -1282,7 +1281,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "Fant ingen skjæring. Ingen endringer ble gjort."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1880,5 +1878,5 @@
 msgstr "Feil under nedlasting"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1895,5 +1893,5 @@
 "<strong>{2}</strong> for å ignorere.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr "Slettede eller flyttede objekter"
@@ -1932,11 +1930,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2076,5 +2074,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2154,5 +2152,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Søk etter objekt."
@@ -2282,5 +2280,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Søk"
@@ -2484,5 +2482,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2527,5 +2525,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr "Slett fra relasjon"
@@ -2567,9 +2565,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "Samle {0} noder"
-msgstr[1] "Samle {0} noder"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2607,9 +2605,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "Roter {0} {1}"
-msgstr[1] "Roter {0} {1}"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2773,7 +2771,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "Endre {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2783,5 +2781,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2828,5 +2826,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2859,5 +2857,5 @@
 msgstr "parameter «{0}» er ikke en tillatt klasse – leste «{1}»"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2871,5 +2869,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "jernbane"
@@ -2884,5 +2882,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3169,5 +3167,5 @@
 msgstr "Ikke vis igjen"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3178,5 +3176,5 @@
 "Sjekk tjeneradressen i innstillingene og at internett-tilkoblingen virker."
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3188,10 +3186,10 @@
 "datasett<br>bryter en forhåndsbetingelse.<br>Feilmelding:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr "Forhåndsbetingelse brutt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3199,25 +3197,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "ukjent"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3227,9 +3225,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3238,9 +3236,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "En uventet unntakstilstand"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3250,9 +3260,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "Ukjent vert"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3265,5 +3275,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr "Objekt allerede slettet"
@@ -3353,10 +3363,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "Brukernavn"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "Passord"
@@ -3560,15 +3570,15 @@
 msgstr "(intet objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "Laget er ikke i lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3623,5 +3633,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr "Lokal med tjeners"
@@ -3630,5 +3640,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr "Lokal med sammenslått"
@@ -3637,20 +3647,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr "Tjeners med sammenslått"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr "rolle {0} deltar ikke i sammenlikningspar {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3660,6 +3670,6 @@
 msgstr "Egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3667,6 +3677,6 @@
 msgstr "Noder"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3674,23 +3684,23 @@
 msgstr "Medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr "Ingen gjenværende egenskapskonflikter å løse"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "Egenskaper ({0} konflikter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr "{0} gjenværende egenskapskonflikter å løse"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr "Noder (løst)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
@@ -3699,17 +3709,17 @@
 "linjas nodeliste."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "Noder (med konflikter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr "Gjenværende konflikter i denne veiens nodeliste"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "Medlemmer (løst)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3719,74 +3729,74 @@
 "denne relasjonens medlemsliste."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "Medlemmer (med konflikter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr "Gjenværende konflikter i denne relasjonens medlemsliste"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr "Ingen gjenværende egenskapskonflikter"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "Egenskaper (med konflikter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr "Gjenværende egenskapskonflikter å løse"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "Konfliktløsning"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr "parameter «current» utenfor rekkevidde: leste {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr "Liste i rolle {0} er for øyeblikket ikke med i et sammenlikningspar."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr "Uventet verdi for parameter «index». Leste {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr "fant ikke {0} i liste"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr "synkron rulling"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr "Sammenlikn "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr "Lokal versjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr "Liste over elementer i det lokale datasettet"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr "Sammenslått versjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3796,18 +3806,18 @@
 "sammenslåingsvalgene tas i bruk."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr "Tjenerversjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr "Liste over elementer i tjenerens datasett"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr "> topp"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
@@ -3815,9 +3825,9 @@
 "elementer"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr "> bunn"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr ""
@@ -3825,5 +3835,5 @@
 "elementer"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3833,5 +3843,5 @@
 "over sammenslåtte elementer"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3841,5 +3851,5 @@
 "lista over sammenslåtte elementer"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
@@ -3847,5 +3857,5 @@
 "elementer"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr ""
@@ -3853,5 +3863,5 @@
 "elementer"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3861,5 +3871,5 @@
 "lista over sammenslåtte elementer"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3869,21 +3879,21 @@
 "i lista over sammenslåtte elementer"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr "Opp"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr "Flytt valgte elementer opp én plass"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr "Ned"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr "Flytt valgte elementer ned én plass"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3892,27 +3902,27 @@
 msgstr "Fjern"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr "Fjern de valgte elementene fra lista over sammenslåtte elementer"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr "Lås"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr "Lås gjeldende liste over sammenslåtte elementer"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr "Lås opp"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr "Lås opp lista over sammenslåtte elementer og begynn sammenslåing"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3922,5 +3932,5 @@
 "tjeneroppføringer</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3931,5 +3941,5 @@
 "tjeneroppføringer</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3938,5 +3948,5 @@
 msgstr[1] "Lokal versjon ({0} oppføringer)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3945,5 +3955,5 @@
 msgstr[1] "Sammenslått versjon ({0} oppføringer)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -3952,21 +3962,21 @@
 msgstr[1] "Tjenerens versjon ({0} oppføringer)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -3976,5 +3986,5 @@
 msgstr "parameter «{0}» må ha en verdi"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -3986,5 +3996,5 @@
 "synkronisert justering."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -3992,19 +4002,19 @@
 msgstr "Justering {0} er ikke regitrert ennå."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr "Node"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr "Uventet kolonneindeks: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -4015,19 +4025,19 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr "Kommunikasjon med tjener feilet"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr "Ja, gjenopprett også dem"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr "Nei, avbryt operasjonen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -4038,9 +4048,9 @@
 "<br><br>Vil du gjenopprette også disse nodene?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr "Gjenopprette ytterligere noder?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -4052,13 +4062,13 @@
 "slettet på tjeneren.<br><br>Vil du gjenopprette også dem?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr "Gjenopprette avhengige objekter?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr "Egenskaper i det lokate datasettet"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -4068,90 +4078,90 @@
 "elementer når sammenslåingsvalgene tas i bruk."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr "Egenskaper i tjenerens datasett"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr "Koordinater:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr "Slettestatus:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr "Synlighetsstatus:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr "(ingen)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "slettet"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr "ikke slettet"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr "synlig (på tjeneren)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr "ikke synlig (på tjeneren)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr "Behold en klone av den lokale versjonen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr "Slett fra det lokale datasettet"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr "Behold lokale koordinater"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr "Behold tjenerens koordinater"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr "Fjern avgjørelse fra koordinatkonflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr "Behold lokal slettestatus"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr "Behold tjenerens slettestatus"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr "Fjern avgjørelse fra slettekonflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr "Behold lokal synlighetsstatus"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr "Ja, nullstill ID"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr "Nei, avbryt"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4164,17 +4174,17 @@
 "<br>Er dette OK?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr "Nullstill ID"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr "Behold tjenerens synlighetsstatus"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr "Ja, rydd ut objektet"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4185,14 +4195,14 @@
 "OK?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr "Fjern fra datasett"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr "Fjern avgjørelse fra visningskonflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4200,21 +4210,21 @@
 msgstr "Rolle"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr "Objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4222,14 +4232,14 @@
 msgstr "<ikke angitt>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr "Sammeslått datasett vil ikke inneholde en egenskap med nøkkel {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4237,7 +4247,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4249,7 +4259,7 @@
 msgstr "Nøkkel"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4262,45 +4272,45 @@
 msgstr "Verdi"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr "Kan ikke bruke uavgjort sammenslåing for egenskap"
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr "Parameter «col» må være 0 eller 1. Leste {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr "Lokalt datasett"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr "Tjenerens datasett"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ">"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Behold valgte nøkkel–verdi-par fra det lokale datasettet"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr "Behold valgte nøkkel–verdi-par fra tjenerens datasettet"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr "Fjern avgjørelse"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr "Fjerner avgjørelse fra valgte egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4320,8 +4330,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4358,5 +4368,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4459,83 +4469,83 @@
 msgstr "Vis historikken for det valgte objektet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "Lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "Liste over alle innleste lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "Slett valgt Lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr "Slett Lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "Vis/Skjul"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "Slå av/på visning av Lag"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "Flytt laget en rad opp."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "Flytt laget en rad ned."
@@ -4545,6 +4555,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4553,22 +4563,22 @@
 msgstr[1] "Dette vil endre opptil {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "Nøkkelen blir ikke lagret når den er tom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<different>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "Endre verdier?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4576,5 +4586,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4583,40 +4593,40 @@
 msgstr[1] "Endre egenskap på inntil {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "Velg en nøkkel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "Velg en verdi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 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/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "Egenskaper/medlemsskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "Egenskaper for valgte objekt."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "Medlem av"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "Tilføy egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4633,39 +4643,39 @@
 msgstr "Legg til"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 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/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "Endre Oppsett"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 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/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaper: {0} / Medlemskap: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "Egenskaper / Medlemskap"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "Skift relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Vil du slette utvalget fra relasjon {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "Fjern den valgte nøkkel i alle objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "DSlett egenskaper"
@@ -4677,5 +4687,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "Relasjoner"
@@ -4707,31 +4717,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "Aktuelt utvalg"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "Åpne vindu med en utvalgsliste"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "Zoom til valgt(e) element"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "Oppfrisk utvalgslisten"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "Zoom til utvalg"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Valgt: Rel.:{0} / Linjer:{1} / Noder:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4739,5 +4749,5 @@
 msgstr "Utvalg"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4746,5 +4756,5 @@
 msgstr[1] "{0} linjer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4753,5 +4763,5 @@
 msgstr[1] "{0} relasjoner"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -4961,7 +4971,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "Slet valgt relasjon"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -5044,5 +5053,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5284,5 +5293,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "Steder"
@@ -5329,21 +5338,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "type"
@@ -6147,72 +6156,517 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "Navn"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+"<html>Versjon <strong>{0}</strong> lagt til <strong>{1}</strong> av <strong>"
+"{2}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr "Versjon {0} lagt til {1} av {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr "Versjon"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr "Bilder for {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr "Les GPX …"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Ingen tid gitt for punkt {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Klarte ikke lese tid «{0}» for punkt {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr "Ingen bilder med lesbare tidsstempler funnet"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "Leser {0} …"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr "Geotaggede bilder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS start: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS-slutt: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr "nåværende forskjell: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr "tidssone-forskjell: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "bilde"
+msgstr[1] "bilder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} innenfor sporet."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "Synkronisér klokke"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG-bilder (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Klarte ikke tolke datoen i fila «{0}»."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Det er ikke noe EXIF-tidspunkt i fila «{0}»."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "Bilde"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Gi den viste dato (mm/dd/åååå TT:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr "GPS-enhetens tidssone (forskjell fra foto)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr "Synkronisér tidspunkt med GPS-enhet"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr "Den indtastede tid kunne ikke tolkes"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr "gps-punkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "Tilpass linjetegning"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr "Bruk globale indstillinger."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr "Tegn linjer mellem punkter i dette laget."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr "Tegn ikke linjer mellem punkt i dette laget."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr "Velg linjetegnings-innstillinger"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "Tilpass farge"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Standard"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Velg en farge"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr "Markører fra navngitte punkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Navngivne sporpunkt fra {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "Importer lyd"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave-lydfiler (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Lyd-markører fra {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "Importer bilder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} spor, "
+msgstr[1] "{0} spor, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} rute, "
+msgstr[1] "{0} ruter, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} waypoint"
+msgstr[1] "{0} waypoints"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr "Navn: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr "Beskrivelse: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr "Tidshorisont: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr "Lengde: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "Konverter til datalag"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+msgid ""
+"<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 "
+"skadeligt <br>Se her for å laste inn GPS spor:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Konvertert fra: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr "Last ned fra OSM langs dette spor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr "Last ned alt innenfor:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr "{0} meter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr "Max areal per forespørsel:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km²"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Fenne handling krever {0} individuelle<br>download-forespørsler. "
+"Ønsker du<br>å fortsette?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr "Ingen GPX-spor er tilgængelige i laget som kan assosieres med lyd."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"Noen waypoints med tidskode før start av track eller etter slutt av track "
+"ble utelatt eller flyttet til start."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Noen waypoints som var langt fra track til å finne fornuftig plassering ble "
+"utelatt."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Datalag {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr "utenfor nedlastet område"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr "versjon {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr "Advarsel: blandede 0.6- og 0.5-data resulterer i versjon 0.5"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} består av:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} slettet.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr "ikke satt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr "API versjon: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr "Konvertér til GPX-lag"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6221,7 +6675,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6231,450 +6685,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "Navn"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-"<html>Versjon <strong>{0}</strong> lagt til <strong>{1}</strong> av <strong>"
-"{2}</strong></html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr "Versjon {0} lagt til {1} av {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr "Versjon"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr "Bilder for {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr "Les GPX …"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Ingen tid gitt for punkt {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Klarte ikke lese tid «{0}» for punkt {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr "Ingen bilder med lesbare tidsstempler funnet"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Leser {0} …"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr "Geotaggede bilder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS start: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS-slutt: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr "nåværende forskjell: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr "tidssone-forskjell: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "bilde"
-msgstr[1] "bilder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} innenfor sporet."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "Synkronisér klokke"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG-bilder (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Klarte ikke tolke datoen i fila «{0}»."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Det er ikke noe EXIF-tidspunkt i fila «{0}»."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "Bilde"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Gi den viste dato (mm/dd/åååå TT:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr "GPS-enhetens tidssone (forskjell fra foto)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr "Synkronisér tidspunkt med GPS-enhet"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr "Den indtastede tid kunne ikke tolkes"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr "gps-punkt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "Tilpass linjetegning"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "Bruk globale indstillinger."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr "Tegn linjer mellem punkter i dette laget."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr "Tegn ikke linjer mellem punkt i dette laget."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr "Velg linjetegnings-innstillinger"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "Tilpass farge"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Standard"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Velg en farge"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr "Markører fra navngitte punkt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Navngivne sporpunkt fra {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "Importer lyd"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave-lydfiler (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Lyd-markører fra {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "Importer bilder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} spor, "
-msgstr[1] "{0} spor, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} rute, "
-msgstr[1] "{0} ruter, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} waypoint"
-msgstr[1] "{0} waypoints"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr "Navn: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr "Beskrivelse: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr "Tidshorisont: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr "Lengde: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "Konverter til datalag"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-msgid ""
-"<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 "
-"skadeligt <br>Se her for å laste inn GPS spor:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Konvertert fra: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr "Last ned fra OSM langs dette spor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr "Last ned alt innenfor:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr "{0} meter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr "Max areal per forespørsel:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km²"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Fenne handling krever {0} individuelle<br>download-forespørsler. "
-"Ønsker du<br>å fortsette?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr "Ingen GPX-spor er tilgængelige i laget som kan assosieres med lyd."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-"Noen waypoints med tidskode før start av track eller etter slutt av track "
-"ble utelatt eller flyttet til start."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Noen waypoints som var langt fra track til å finne fornuftig plassering ble "
-"utelatt."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Datalag {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr "utenfor nedlastet område"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr "versjon {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr "Advarsel: blandede 0.6- og 0.5-data resulterer i versjon 0.5"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} består av:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} slettet.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr "ikke satt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr "API versjon: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr "Konvertér til GPX-lag"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -7062,5 +7071,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "Bil"
@@ -7077,16 +7086,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "Sykkel"
@@ -7114,14 +7125,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "Til fots"
@@ -7337,19 +7351,19 @@
 msgstr "Språk"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr "Benytt innebygd standardverdier"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr "Map Pain stiler"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr "Brukt stil"
@@ -7480,40 +7494,11 @@
 msgstr "Passord for proxy-tjener"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr "URL-adressen for OSM-tjeneren (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr "E-postadresse for OSM-kontoen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Innloggings passord til OSM kontoen. La feltet være tomt for ikke å lagre "
-"noen passord."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "URL-adresse til tjener"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr "OSM-brukernavn (e-post)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "OSM passord"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
-"<html>Advarsel: Passordet lagres i ren tekst i innstillingsfila."
-"<br>Passordet overføres i ren tekst til tjeneren som del av URL-adressen."
-"<br><b>Ikke bruk et verdifullt passord.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -7882,7 +7867,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "Klarte ikke lese «{0}»"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -7987,7 +7972,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "Ukjent rolle «{0}»."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8149,23 +8134,52 @@
 msgstr "Ugyldig bzip2-fil"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "Feil passord eller brukernavn."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Advarsel: Passordet overføres ukryptert."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "Lagre bruker og passord (ukryptert)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
 msgstr "Logg inn"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr "E-postadresse for OSM-kontoen"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr ""
+"Innloggings passord til OSM kontoen. La feltet være tomt for ikke å lagre "
+"noen passord."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr "OSM-brukernavn (e-post)"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "OSM passord"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
+"<html>Advarsel: Passordet lagres i ren tekst i innstillingsfila."
+"<br>Passordet overføres i ren tekst til tjeneren som del av URL-adressen."
+"<br><b>Ikke bruk et verdifullt passord.</b></html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -8339,14 +8353,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "Ukjent medlemstype for «{0}»."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "Klargjør OSM-data …"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr "Feil id for node"
@@ -8806,5 +8820,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr "Beskrivelse"
@@ -9220,5 +9234,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr "Feil ved lasting av fil"
@@ -9472,5 +9486,4 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
-#, fuzzy
 msgid ""
 "To enable the cadastre WMS plugin, change\n"
@@ -9478,6 +9491,4 @@
 "projection and retry"
 msgstr ""
-"For å aktivisere Cadastre WMS plugin (Fransk matrikkel)\n"
-"Bytt kartprojeksjon til Lambert og restart JOSM"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9569,5 +9580,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -10109,7 +10120,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr "vann"
@@ -10292,7 +10303,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "navn"
+msgstr ""
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10857,12 +10867,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "start"
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0} node"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11002,5 +11012,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr "Gatenavn"
@@ -11826,7 +11836,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr "bygning"
@@ -11840,5 +11850,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr "område"
@@ -12094,12 +12104,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "Velg raden som skal endres"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "Lagre WMS-lag"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
@@ -12112,7 +12120,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "Ingen endringer å laste opp."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -12125,61 +12132,61 @@
 "Dette resulterer i feil koordinater."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr "Automatisk nedlasting"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS lag ({0}) laster automatisk ned i zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS lag ({0})  laster ned i zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr "Du har bestilt for stort område. Zoom inn eller bytt oppløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr "Last ned synlige kartbilder"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr "Bytt oppløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr "Last ned kartbilder med feil på nytt"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr "Lagre WMS lag til fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr "Lagre WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr "les inn WMS lag fra fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr "Last inn WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Støtter ikke WMS fil versjon;fant {0}, ønsker {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr "Feil Fil Format"
@@ -12546,4 +12553,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12580,7 +12589,7 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
-msgstr "Gater"
+msgstr "Veier"
 
 #. group "Streets"
@@ -12589,5 +12598,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Motorvei"
@@ -12596,5 +12605,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr "Rediger motorvei"
@@ -12621,8 +12630,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr "Veinummer"
@@ -12663,21 +12672,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr "Lag"
@@ -12691,8 +12700,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr "Kjørebaner"
@@ -12710,15 +12719,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr "Hastighetsbegrensning (km/t)"
@@ -12755,16 +12764,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr "Enveiskjøring"
@@ -12806,19 +12815,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Bro"
@@ -12854,19 +12863,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -12900,18 +12909,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr "Skjæring"
@@ -12945,18 +12954,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr "Øy"
@@ -12964,5 +12973,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr "Av-/påkjørsel for motorvei"
@@ -12971,5 +12980,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr "rediger av-/påkjørsel for motorvei"
@@ -12977,5 +12986,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr "Stamvei"
@@ -12984,5 +12993,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr "Rediger stamvei"
@@ -12992,6 +13001,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr "Motorsykkel"
@@ -12999,5 +13008,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr "Av-/påkjørsel for stamvei"
@@ -13006,5 +13015,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr "Rediger av-/påkjørsel for stamvei"
@@ -13017,5 +13026,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Riksvei"
@@ -13024,5 +13033,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr "Rediger riksvei"
@@ -13030,10 +13039,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr "Av-/påkjørsel for riksvei"
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr "Rediger av-/påkjørsel for riksvei"
@@ -13045,5 +13054,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Fylkesvei e.l."
@@ -13053,5 +13062,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr "Rediger fylkesvei e.l."
@@ -13059,5 +13068,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr "Kommunal vei"
@@ -13067,5 +13076,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr "Rediger kommunal vei"
@@ -13077,5 +13086,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Småvei"
@@ -13085,5 +13094,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr "Rediger småvei"
@@ -13110,19 +13119,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr "Bredde ( meter)"
@@ -13134,5 +13143,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Boligfeltvei"
@@ -13141,5 +13150,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr "Rediger boligfeltvei"
@@ -13163,13 +13172,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr "Veidekke"
@@ -13189,20 +13198,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr "fast dekke"
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr "uten fast dekke"
@@ -13210,12 +13219,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr "brostein"
@@ -13223,5 +13232,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr "Gatetun"
@@ -13230,5 +13239,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr "Rediger gatetun"
@@ -13236,5 +13245,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr "oppkjørsel"
@@ -13243,5 +13252,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr "Rediger oppkjørsel"
@@ -13251,18 +13260,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr "Type adkomstvei"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr "Smug"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr "Oppkjørsel"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr "parking_aisle"
@@ -13270,5 +13279,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr "Parkeringsvei"
@@ -13278,5 +13287,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr "Rediger parkeringsvei"
@@ -13284,5 +13293,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr "Vei (ukjent type)"
@@ -13291,5 +13300,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr "Rediger vei av ukjent type"
@@ -13298,20 +13307,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr "Restriksjoner"
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr "Rediger restriksjioner"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr "Avgift"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr "Ingen gjennomkjøring"
@@ -13324,8 +13333,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr "Adkomst"
@@ -13369,23 +13378,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr "ja"
@@ -13398,40 +13407,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr "privat"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr "brukertype"
@@ -13444,19 +13453,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr "destinasjon"
@@ -13479,65 +13488,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr "permissive"
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr "Skog- og Landbruk"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr "nei"
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr "Varer"
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Tung last (hgv)"
@@ -13552,10 +13561,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr "Hest"
@@ -13571,13 +13580,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr "Motorsykkel"
@@ -13593,30 +13602,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr "Motorkjøretøy"
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr "Offentlige Tjenestekjøretøy (psv)"
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr "Motorbåt"
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr "Båt"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr "Min. hastighet (km/t)"
@@ -13624,25 +13633,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr "maks totalvekt"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr "Max. Høyde (meter)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr "Max. Bredde (meter)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr "Max. Lengde (meter)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr "Rundkjøring"
@@ -13653,5 +13662,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr "Rediger kryss"
@@ -13673,9 +13682,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr "Type"
@@ -13695,10 +13704,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr "motorway"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr "motorway_link"
@@ -13720,10 +13729,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr "trunk"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr "trunk_link"
@@ -13745,10 +13754,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr "riksvei"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr "tilkjørselsvei_riksvei"
@@ -13770,6 +13779,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr "fylkesvei"
@@ -13783,9 +13792,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr "kommunevei"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr "småvei"
@@ -13799,9 +13808,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr "boligvei"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr "gatetun"
@@ -13831,10 +13840,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr "adkomstvei"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr "trikkespor"
@@ -13842,4 +13851,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13857,6 +13873,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr "veiarbeid"
@@ -13867,10 +13883,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr "Rediger bro"
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr "Rediger tunnel"
@@ -13878,19 +13894,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr "Gater"
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr "Veiarbeid"
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr "Rediger vei under bygging"
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr "Kryss"
@@ -13906,5 +13922,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr "rundkjøring"
@@ -13913,5 +13929,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr "Ridevei"
@@ -13919,5 +13935,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr "Rediger ridevei"
@@ -13925,5 +13941,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr "Sykkelvei"
@@ -13933,5 +13949,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr "Rediger sykkelvei"
@@ -13939,5 +13955,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr "Gangvei"
@@ -13946,5 +13962,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr "Rediger gangvei"
@@ -13952,5 +13968,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr "Gågate"
@@ -13959,5 +13975,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr "Rediger gågate"
@@ -13965,5 +13981,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr "Trapper"
@@ -13973,5 +13989,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr "Rediger trapper"
@@ -13980,5 +13996,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr "Traktorvei"
@@ -13987,14 +14003,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr "Rediger traktorvei"
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr "betong"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr "grus"
@@ -14002,18 +14018,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr "jord"
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr "gress"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr "sand"
@@ -14021,5 +14037,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr "Traktorvei klasse 1"
@@ -14028,5 +14044,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr "Rediger traktorvei klasse 1"
@@ -14034,5 +14050,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr "Traktorvei klasse 2"
@@ -14041,5 +14057,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr "Rediger traktorvei klasse 2"
@@ -14047,5 +14063,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr "Traktorvei klasse 3"
@@ -14054,5 +14070,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr "Rediger traktorvei klasse 3"
@@ -14060,5 +14076,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr "Traktorvei klasse 4"
@@ -14067,5 +14083,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr "Rediger traktorvei klasse 4"
@@ -14073,5 +14089,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr "Traktorvei klasse 5"
@@ -14080,5 +14096,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr "Rediger traktorvei klasse 5"
@@ -14087,5 +14103,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr "Sti"
@@ -14094,13 +14110,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr "Rediger sti"
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr "Snøscooter"
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr "Ski"
@@ -14108,5 +14124,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr "Tursti"
@@ -14116,5 +14132,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr "Rediger tursti"
@@ -14122,5 +14138,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr "Fjellsti"
@@ -14130,5 +14146,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr "Rediger fjellsti"
@@ -14136,5 +14152,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr "Krevende fjellsti"
@@ -14144,5 +14160,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Rediger krevende fjellsti"
@@ -14150,5 +14166,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr "Alpin fjellsti"
@@ -14158,5 +14174,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr "Rediger alpin fjellsti"
@@ -14164,5 +14180,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr "Krevende alpin fjellsti"
@@ -14172,5 +14188,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Rediger krevende alpin fjellsti"
@@ -14178,5 +14194,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr "Vanskelig alpin fjellsti"
@@ -14186,5 +14202,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Rediger vanskelig alpin fjellsti"
@@ -14192,10 +14208,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr "Veipunkt"
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr "Motorveikryss"
@@ -14203,15 +14219,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr "Rediger motorveikryss"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr "Service"
@@ -14219,5 +14235,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr "Rediger Serviceområde"
@@ -14252,14 +14268,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr "Operatør"
@@ -14268,5 +14284,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr "Trafikklys"
@@ -14276,5 +14292,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr "Type gangfelt"
@@ -14283,27 +14299,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr "ukontrollert"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr "trafikklys"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr "trafikkøy"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr "umerket"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr "Kryssende ridevei"
@@ -14311,6 +14327,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr "Kryssende sykkelvei"
@@ -14319,11 +14335,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr "Betjent fotgjengerfelt"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr "Crossing type name (UK)"
@@ -14331,30 +14347,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr "pelican"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr "Full stopp"
@@ -14362,5 +14378,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr "Fotgjengerfelt"
@@ -14369,14 +14385,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr "Rediger fotgjengerfelt"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr "Type name (UK)"
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr "Mini-rundkjøring"
@@ -14387,14 +14403,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr "Retning"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr "med_klokka"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr "Vendesirkel"
@@ -14404,20 +14420,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr "Bygrense"
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr "Rediger bygrenseskilt"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr "Annet navn"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr "Fotoboks"
@@ -14425,5 +14441,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr "Nødtelefon"
@@ -14431,5 +14447,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr "Stigning"
@@ -14437,5 +14453,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr "Sterk stigning"
@@ -14444,10 +14460,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr "Vadested"
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr "Rediger vadested"
@@ -14455,5 +14471,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr "Fjellpass"
@@ -14461,5 +14477,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr "Rediger fjellpass"
@@ -14471,7 +14487,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr "Høyde"
@@ -14479,5 +14495,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr "Stengsel"
@@ -14485,5 +14501,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr "Sperresøyle"
@@ -14491,5 +14507,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr "Rediger sperresøyle"
@@ -14528,18 +14544,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr "Tillatt trafikk:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr "Halvbommer"
@@ -14548,5 +14568,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr "Steinblokk"
@@ -14554,5 +14574,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr "Ferist"
@@ -14560,10 +14580,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr "Rediger ferist"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr "Bussluse"
@@ -14571,15 +14591,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr "Pigghinder"
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr "Rediger pigghinder"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr "Bomstasjon"
@@ -14587,5 +14607,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr "Rediger bomstasjon"
@@ -14593,10 +14613,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr "Tollstasjon"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr "Rediger tollstasjon"
@@ -14606,5 +14626,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr "Hekk"
@@ -14613,5 +14633,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr "Gjerde"
@@ -14620,5 +14640,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr "Mur"
@@ -14626,5 +14646,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr "Bymur"
@@ -14633,5 +14653,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr "Støttemur"
@@ -14643,15 +14663,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr "Inngang"
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr "Rediger inngang"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr "Port"
@@ -14659,50 +14679,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr "Rediger port"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr "Veibom"
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr "Rediger veibom"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr "Gjerdestengsel"
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr "Rediger gjerdestengsel"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr "Støtfangergjerde"
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr "Rediger støtfangergjerde"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr "Fotgjengerport"
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr "Rediger fotgjengerport"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr "Gjerdetrapp"
@@ -14710,15 +14730,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr "Rediger gjerdetrapp"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+#, fuzzy
+msgid "Turnstile"
+msgstr "Dreieskive"
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "Rediger gjerdetrapp"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr "Sortiport"
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr "Rediger sortiport"
@@ -14729,10 +14761,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr "Vann"
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr "Vannkilde"
@@ -14740,5 +14772,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr "Rediger vannkilde"
@@ -14746,5 +14778,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr "Drenering"
@@ -14752,10 +14784,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr "Rediger drenering"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr "Bekk"
@@ -14763,10 +14795,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr "Rediger bekk"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr "Kanal"
@@ -14774,10 +14806,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr "Rediger kanal"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr "Elv"
@@ -14787,5 +14819,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr "Rediger elv"
@@ -14793,15 +14825,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr "Rediger vann"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr "Rediger land"
@@ -14809,15 +14841,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr "Basseng"
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr "Rediger basseng"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr "Drikkevannskilde"
@@ -14825,15 +14857,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr "Rediger drikkevannskilde"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr "Tildekt drikkevannskilde"
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr "Rediger tildekt drikkevannskilde"
@@ -14841,5 +14873,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr "Elvebredd"
@@ -14848,10 +14880,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr "Rediger elvebredd"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr "Våtmarksområde"
@@ -14862,14 +14894,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr "Rediger våtmarksområde"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr "Sumpområde"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr "Flytemyr"
@@ -14883,35 +14915,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr "Myrområde"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr "Sivområde"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr "Saltmyr"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr "Tidevannsflate"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr "Mangrove"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr "Gjørme"
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr "Rediger gjørme"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr "Strand"
@@ -14919,20 +14951,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr "Rediger strand"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr "Havbukt"
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr "Rediger havbukt"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr "Klippe"
@@ -14940,10 +14972,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr "Rediger klippe"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr "Kystlinje"
@@ -14951,5 +14983,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr "Rediger kystlinje"
@@ -14957,5 +14989,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr "Fergerute"
@@ -14963,5 +14995,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr "Rediger fergerute"
@@ -14970,5 +15002,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr "Skipsverft"
@@ -14976,10 +15008,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr "Rediger skipsverft"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr "Tørrdokk"
@@ -14987,5 +15019,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr "Rediger tørrdokk"
@@ -14993,5 +15025,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr "Demning"
@@ -14999,15 +15031,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr "Rediger demning"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr "Punkt i vann"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr "Sluseport"
@@ -15016,5 +15048,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr "Terskeldam"
@@ -15022,20 +15054,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr "Rediger terskeldam"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr "Foss"
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr "Rediger foss"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr "Snuplass"
@@ -15044,15 +15076,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr "Marina"
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr "Rediger marina"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr "Brygge"
@@ -15060,10 +15092,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr "Rediger brygge"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr "Fergeleie"
@@ -15071,10 +15103,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr "Rediger fergeleie"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr "Båtslipp"
@@ -15084,5 +15116,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr "Rediger båtslipp"
@@ -15090,10 +15122,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr "Jernbane"
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr "Jernbane"
@@ -15101,5 +15133,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr "Rediger jernbane"
@@ -15129,8 +15161,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr "Alternative typer"
@@ -15144,35 +15176,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr "Stasjonsområde"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr "Sidespor"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr "Privat sidespor"
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr "Smal jernbane"
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr "Rediger smal jernbane"
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr "Monorail"
@@ -15180,45 +15212,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr "Rediger Monorail"
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr "Fredet bane"
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr "Rediger fredet bane"
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr "Bybane"
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr "Rediger bybane"
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr "T-bane"
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr "Rediger T-bane"
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr "Trikk"
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr "Rediger trikk"
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr "Busspor"
@@ -15226,5 +15258,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr "Rediger busspor"
@@ -15233,14 +15265,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr "Nedlagt jernbane"
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr "Rediger nedlagt jernbane"
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr "Revet jernbane"
@@ -15249,5 +15281,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr "Planovergang"
@@ -15256,5 +15288,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr "Fotgjengerfelt"
@@ -15264,5 +15296,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr "Type fotgjengerfelt"
@@ -15270,5 +15302,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr "Dreieskive"
@@ -15277,10 +15309,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr "Taubaner og -heiser"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr "Stolheis"
@@ -15288,10 +15320,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr "Rediger stolheis"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr "T-krokheis"
@@ -15299,10 +15331,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr "Rediger T-krokheis"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr "Taubane"
@@ -15310,10 +15342,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr "Rediger taubane"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr "Gondolbane"
@@ -15321,5 +15353,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr "Rediger gondolbane"
@@ -15327,5 +15359,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr "Stasjon"
@@ -15336,10 +15368,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr "Rediger stasjon"
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr "Bensinstasjon"
@@ -15349,5 +15381,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr "Rediger bensinstasjon"
@@ -15363,5 +15395,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15371,5 +15403,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr "Rediger parkering"
@@ -15377,41 +15409,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr "Kapasitet"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr "Overflateparkering"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr "P-hus"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr "P-kjeller"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr "Innfartsparkering"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr "Handicap-plasser"
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr "Gebyr"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr "Bilvask"
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr "Rediger bilvask"
@@ -15419,5 +15451,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr "Butikk"
@@ -15425,15 +15457,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr "Rediger bilforretning"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr "Verksted"
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr "Rediger verksted"
@@ -15441,5 +15473,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr "Bilutleie"
@@ -15448,10 +15480,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr "Rediger bilutleie"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr "Bildeling"
@@ -15459,5 +15491,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr "Rediger bildeling"
@@ -15465,5 +15497,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr "Rediger sykkelparkering"
@@ -15472,5 +15504,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr "Rediger sykkelutleie"
@@ -15479,15 +15511,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr "Rediger sykkelbutikk"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "Offentlig transport"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr "Internasjonal UIC-jernbanekode"
@@ -15495,5 +15527,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr "Jernbanestopp"
@@ -15501,5 +15533,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr "Rediger jernbanestopp"
@@ -15507,5 +15539,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr "Trikkestopp"
@@ -15514,5 +15546,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr "Rediger trikkestopp"
@@ -15520,5 +15552,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr "Jernbaneplattform"
@@ -15527,5 +15559,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr "Rediger jernbaneplattform"
@@ -15537,5 +15569,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr "Spornummer"
@@ -15543,10 +15575,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr "Område"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr "T-baneinngang"
@@ -15555,10 +15587,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr "Rediger T-baneinngang"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr "Rullestol"
@@ -15567,5 +15599,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr "Busstasjon"
@@ -15574,5 +15606,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr "Rediger busstasjon"
@@ -15580,5 +15612,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr "Bussholdeplass"
@@ -15588,5 +15620,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr "Rediger bussholdeplass"
@@ -15597,6 +15629,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr "Leskur / Ly for natten"
@@ -15604,10 +15636,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr "Bussplatform"
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr "Rediger bussplattform"
@@ -15615,5 +15647,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr "Taxi"
@@ -15621,5 +15653,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr "Rediger taxi-stasjon"
@@ -15627,5 +15659,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr "Flyplass"
@@ -15633,15 +15665,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr "Rediger flyplass"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr "ICAO"
@@ -15650,5 +15682,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr "Overnatting"
@@ -15660,5 +15692,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotell"
@@ -15667,15 +15699,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr "Rediger hotell"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr "Stjerner"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr "Motell"
@@ -15683,20 +15715,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr "Rediger motell"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr "Gjestehus"
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr "Rediger gjestehus"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr "Feriehytter"
@@ -15704,10 +15736,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr "Rediger feriehytter"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr "Ungdomsherberge"
@@ -15715,30 +15747,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr "Rediger ungdomsherberge"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr "Fjellstue"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr "Rediger fjellstue"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr "Campingvognplass"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr "Rediger campingvognplass"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr "Campingplass"
@@ -15746,10 +15778,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr "Rediger campingplass"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "Mat og drikke"
@@ -15760,5 +15792,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -15766,5 +15798,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr "Rediger restaurant"
@@ -15772,5 +15804,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr "Kjøkken"
@@ -15778,61 +15810,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr "italiensk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr "kinesisk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr "gatekjøkken"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr "gresk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr "tysk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr "indisk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr "lokal"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr "tyrkisk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr "asiatisk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr "meksikansk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr "japansk"
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr "Gatekjøkken"
@@ -15840,9 +15872,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr "Rediger gatekjøkken"
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr "Kafé"
@@ -15850,10 +15882,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr "Rediger kafé"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr "Pub"
@@ -15861,20 +15893,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr "Rediger pub"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr "Rediger Biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr "Bar"
@@ -15882,10 +15914,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr "Rediger bar"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr "Nattklubb"
@@ -15893,20 +15925,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr "Rediger nattklubb"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "Turisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr "Attraksjon"
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr "Rediger attraksjon"
@@ -15915,11 +15947,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr "Åpningstider"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "Museum"
@@ -15927,10 +15959,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr "Rediger museum"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "Zoologisk hage"
@@ -15939,10 +15971,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr "Rediger  zoologisk hage"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr "Utsiktspunkt"
@@ -15950,25 +15982,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr "Rediger utsiktspunkt"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr "Utsiktstårn"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr "Temapark"
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr "Rediger temapark"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr "Kunstverk"
@@ -15976,5 +16008,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr "Rediger kunstverk"
@@ -15982,5 +16014,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr "Turistinformasjon"
@@ -15988,80 +16020,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr "Rediger turistinformasjon"
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "Kart"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr "Karttype"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr "kart"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr "bykart"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr "turkart"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr "sykkelkart"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
 msgid "Closer Description"
 msgstr "Nærmere forklaring"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1701
 msgid "Information Board"
 msgstr "Informasjonstavle"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Board Type"
 msgstr "Tavletype"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "board"
 msgstr "infotavle"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "history"
 msgstr "historisk"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "nature"
 msgstr "natur"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "wildlife"
 msgstr "dyreliv"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Guidepost (Hiking)"
 msgstr "Veiviser (turvei)"
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr "Annen informasjon"
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr "Rediger ly for natten"
@@ -16069,25 +16101,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr "Bålplass"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr "Piknik-sted"
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr "Rediger piknik-sted"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "Historiske steder"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "Slott"
@@ -16096,20 +16128,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr "Rediger slott"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr "Rediger ruiner"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr "Arkeologisk plass"
@@ -16118,10 +16150,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr "Rediger arkeologisk plass"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr "Slagmark"
@@ -16129,5 +16161,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr "Rediger slagmark"
@@ -16135,15 +16167,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr "Rediger monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr "Minneplatte"
@@ -16151,45 +16183,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr "Rediger minneplatte"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr "Kors i veikant"
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr "Rediger kors i veikant"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr "Veialter"
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr "Rediger veialter"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "Fritid"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr "Badepark"
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr "Rediger badepark"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "Lekeplass"
@@ -16197,15 +16229,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr "Rediger lekeplass"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "Fiskeplass"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr "Rediger fiskeplass"
@@ -16213,15 +16245,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr "Sport"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr "Rediger stadion"
@@ -16235,6 +16267,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "velg sport:"
@@ -16257,4 +16289,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -16315,5 +16355,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16323,5 +16371,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16467,5 +16515,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16571,5 +16619,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16610,29 +16658,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr "sport"
@@ -16642,227 +16691,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr "flerbruk"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr "bueskyting"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr "turn"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr "australsk fotball"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr "bowls"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr "klatring"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr "cricketnett"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr "krocket"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr "sykling"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr "hundeløp"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr "ridning"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr "football"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr "gymnastikk"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr "ishockey"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr "hesteløp"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr "motorsport"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr "skyting"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr "skøyter"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr "ski"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "fotball"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr "svømming"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr "Sportssenter"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr "Rediger sportssenter"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr "Bane"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr "Rediger bane"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr "Racerbane"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr "Rediger racerbane"
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr "Golfbane"
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr "Rediger golfbane"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr "Rediger minigolf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr "Flerbruk"
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr "Rediger flerbruk"
@@ -16901,191 +16950,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr "bane"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr "sportssenter"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr "bowling"
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr "Rediger bowling"
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr "Turn"
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr "Rediger turn"
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr "Bueskyting"
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr "Rediger bueskyting"
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr "Klatring"
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr "Rediger klatring"
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr "Rediger kano"
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr "Sykling"
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr "Rediger sykling"
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr "Hundeløp"
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr "Rediger hundeløp"
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr "Ridning"
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr "Rediger ridning"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr "Hesteløp"
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr "Rediger hesteløp"
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr "Gymnastikk"
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr "Rediger gymnastikk"
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr "Rediger motorsport"
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr "Skøyter"
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr "Rediger skøyter"
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr "Rediger skateboard"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr "Svømming"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr "Rediger svømming"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr "Ski"
@@ -17093,56 +17142,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr "Rediger ski"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr "Løypetype"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr "slalom"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr "langrenn"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr "snøpark"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr "Vanskelighetsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr "begynner"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr "enkel"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr "middels"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr "vanskelig"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr "fristil"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr "Skyting"
@@ -17150,178 +17199,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr "Rediger skyting"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr "Ballsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr "Fotball"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr "Rediger fotball"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr "Amerikansk fotball"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr "Rediger amerikansk fotball"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr "Australsk fotball"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr "Rediger australsk fotball"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr "Rediger baseball"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr "Rediger basketball"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr "Rediger golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr "golfbane"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr "Rediger boule"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr "Rediger bowls"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr "Rediger cricket"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr "Cricketnett"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr "Rediger cricketnett"
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr "Rediger krocket"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr "Ishockey"
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr "Rediger ishockey"
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr "Rediger pelota"
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr "Rediger racquet"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr "Rediger rugby"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr "Rediger bordtennis"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr "Rediger tennis"
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "Bygninger"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr "Bygning"
@@ -17329,5 +17378,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "Offentlig bygning"
@@ -17335,10 +17384,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr "Rediger offentlig bygning"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "Rådhus"
@@ -17346,10 +17395,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "Rediger rådhus"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "Ambassade"
@@ -17357,10 +17406,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "Rediger ambassade"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "Domstol"
@@ -17369,10 +17418,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "Rediger domstol"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "Fengsel"
@@ -17381,10 +17430,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "Rediger fengsel"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "Politi"
@@ -17394,10 +17443,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "Rediger politi"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "Brannstasjon"
@@ -17406,10 +17455,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "Rediger brannstasjon"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "Postkontor"
@@ -17417,5 +17466,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr "Rediger postkontor"
@@ -17423,15 +17472,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr "Barnehage"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr "Rediger barnehage"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "Skole"
@@ -17439,10 +17488,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "Rediger skole"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr "Universitet"
@@ -17450,10 +17499,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr "Rediger universitet"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr "Høyskole"
@@ -17461,5 +17510,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr "Rediger høyskole"
@@ -17467,5 +17516,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "Kino"
@@ -17474,10 +17523,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "Rediger kino"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "Bibliotek"
@@ -17486,10 +17535,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "Rediger bibliotek"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr "Kunstsenter"
@@ -17497,10 +17546,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr "Rediger kunstsenter"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "Teater"
@@ -17509,10 +17558,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "Rediger teater"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr "Tilbedelsessted"
@@ -17522,5 +17571,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr "Rediger tilbedelsessted"
@@ -17529,6 +17578,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr "Religion"
@@ -17537,66 +17586,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr "kristen"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr "jødisk"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr "unitarisk"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr "zoroastrisk"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr "Trosretniing"
@@ -17605,81 +17654,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr "anglikansk"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr "katolsk"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr "evangelisk"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr "Jehovas vitner"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr "luthersk"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr "metodist"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr "mormoner"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr "ortodoks"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr "pinsebevegelsen"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr "presbyteriansk"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr "Adresser"
@@ -17688,5 +17737,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr "Rediger adresseinformasjon"
@@ -17694,5 +17743,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr "Husnummer"
@@ -17700,20 +17749,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr "Husnavn"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr "By/sted"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr "Landskode"
@@ -17721,5 +17770,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr "Interpoler adresser"
@@ -17728,5 +17777,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr "Rediger interpolasjon"
@@ -17734,71 +17783,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr "Nummereringsmåte"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr "oddetall"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr "partall"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr "alle"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr "alfabetisk"
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr "Menneskeskapt"
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr "Fabrikk"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr "Rediger fabrikk"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "Tårn"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "Rediger tårn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "Vanntårn"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "Rediger vanntårn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr "Gassbeholder"
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr "Rediger gassbeholder"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "Fyrtårn"
@@ -17806,10 +17855,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "Rediger fyrtårn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "Vindmølle"
@@ -17817,10 +17866,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "Rediger vindmølle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "Rørledning"
@@ -17828,10 +17877,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "Rediger rørledning"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr "Kloakkrenseanlegg"
@@ -17841,10 +17890,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr "Rediger kloakkrenseanlegg"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr "Kran"
@@ -17852,10 +17901,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr "Rediger kran"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr "Fyrlykt"
@@ -17863,10 +17912,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr "Rediger fyrlykt"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr "Trigonometrisk punkt"
@@ -17874,10 +17923,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr "Rediger trigonometrisk punkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr "Overvåkingskamera"
@@ -17885,5 +17934,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr "Rediger overvåkingskamera"
@@ -17891,5 +17940,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr "Kraftverk"
@@ -17899,39 +17948,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr "Rediger kraftverk"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr "vind"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr "vann"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr "atom"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr "kull"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr "solcelle"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr "gass"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr "Kraftstasjon"
@@ -17940,10 +17989,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr "Rediger kraftstasjon"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr "Transformatorstasjon"
@@ -17952,5 +18001,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr "Rediger transformatorstasjon"
@@ -17958,10 +18007,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr "Linjenummer"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr "Kraftmast"
@@ -17972,5 +18021,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr "Rediger kraftmast"
@@ -17978,5 +18027,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr "Kraftlinje"
@@ -17985,25 +18034,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr "Rediger kraftlinje"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr "Spenning"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr "Antall ledere"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr "Fasiliteter"
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "Toaletter"
@@ -18011,20 +18060,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr "Referansenummer"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr "Kommentar"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr "Postkasse"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "Telefon"
@@ -18033,5 +18082,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr "Rediger telefon"
@@ -18039,5 +18088,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "Mynter"
@@ -18045,5 +18094,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr "Sedler"
@@ -18051,5 +18100,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronisk lommebok eller betalingskort"
@@ -18057,5 +18106,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr "Bankkort"
@@ -18063,15 +18112,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "Kredittkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr "Returstasjon"
@@ -18080,5 +18129,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr "Rediger returstasjon"
@@ -18086,35 +18135,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr "Bokser"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr "Klær"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr "Papir"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr "Metall"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr "Benk"
@@ -18123,20 +18172,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr "Jaktpost"
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr "Rediger jaktpost"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr "Skjul"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr "Lås"
@@ -18144,22 +18193,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr "Høyde"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr "lav"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr "Fontene"
@@ -18168,10 +18217,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr "Rediger fontene"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "Drikkevann"
@@ -18180,10 +18229,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "Rediger drikkevann"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr "Stellebord"
@@ -18191,25 +18240,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr "Rediger stellebord"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "Butikker"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr "Supermarked"
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr "Rediger supermarked"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr "Minimarked"
@@ -18217,10 +18266,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr "Rediger Minimarked"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -18228,10 +18277,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr "Rediger kiosk"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "Automat"
@@ -18239,5 +18288,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "Rediger automat"
@@ -18245,88 +18294,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "Automatprodukter"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr "billetter"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr "buss-, trikk- og togkart"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr "parkeringsbillett"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr "mat"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "drikke"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr "godter"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr "sigaretter"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr "foto"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr "dyremat"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "aviser"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "leker"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr "frimerke"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr "sedler"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr "tamponger"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr "hundeposer"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr "kundekort"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "Slakter"
@@ -18334,10 +18383,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "Rediger slakter"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "Baker"
@@ -18345,10 +18394,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "Rediger baker"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr "Blomster"
@@ -18356,20 +18405,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr "Rediger blomster"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr "Økologisk"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr "Rediger økologisk"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr "Sprit og vin"
@@ -18377,60 +18426,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr "Rediger sprit og vin"
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr "Drikke"
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr "Rediger drikke"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr "Dataelektronikk"
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr "Rediger dataelektronikk"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr "Elektronikk"
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr "Rediger elektronikk"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr "Rediger hifi"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr "Møbler"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr "Rediger møbler"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr "Hagesenter"
@@ -18438,10 +18487,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr "Rediger hagesenter"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr "Jernvarehandel"
@@ -18449,10 +18498,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr "Rediger jernvarehandel"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr "Byggevare"
@@ -18460,60 +18509,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr "Rediger byggevare"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr "Kontor"
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr "Rediger kontor"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr "Frisør"
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr "Rediger frisør"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr "Sko"
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr "Rediger sko"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr "Leker"
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr "Rediger leker"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr "Video"
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr "Rediger video"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "Renseri"
@@ -18521,10 +18570,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "Rediger renseri"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "Vaskeri"
@@ -18532,10 +18581,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "Rediger vaskeri"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr "Friluftsutstyr"
@@ -18543,35 +18592,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr "Rediger friluftsutstyr"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr "Sport"
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr "Rediger sport"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr "Optiker"
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr "Rediger optiker"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "Valuta"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "Bank"
@@ -18579,5 +18628,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "Rediger bank"
@@ -18585,10 +18634,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "Minibank"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr "Veksle valuta"
@@ -18596,5 +18645,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr "Rediger valutaveksling"
@@ -18602,15 +18651,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "Rediger minibank"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "Helse"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr "Lege"
@@ -18618,20 +18667,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr "Rediger lege"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr "Tannlege"
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr "Rediger tannlege"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -18639,5 +18688,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "Rediger apotek"
@@ -18645,10 +18694,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr "Reseptlevering"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "Sykehus"
@@ -18656,10 +18705,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "Rediger sykehus"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr "Redningsmøtepunkt"
@@ -18668,5 +18717,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr "Rediger redningsmøtepunkt"
@@ -18675,20 +18724,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr "Punktnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr "Navn på punkt"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Bruk internasjonalt nummer, f.eks. +12-345-67890)"
@@ -18696,5 +18745,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr "Veterinær"
@@ -18703,56 +18752,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr "Rediger veterinær"
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr "Rediger kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr "Rediger land"
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr "Delstat/provins"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr "Rediger delstat/provins"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr "Region"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr "Rediger region (fylke)"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr "Kommune"
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr "Rediger kommune"
@@ -18760,15 +18808,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr "Storby"
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr "Rediger storby"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr "By"
@@ -18776,10 +18824,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr "Rediger by"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr "Forstad/bydel"
@@ -18787,25 +18835,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr "Rediger forstad/bydel"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "Landsby"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "Rediger landsby"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr "Grend"
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr "Rediger grend"
@@ -18813,5 +18861,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr "Lokalitet"
@@ -18819,10 +18867,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr "Rediger lokalitet"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "Øy"
@@ -18830,5 +18878,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "Rediger øy"
@@ -18836,5 +18884,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr "Huleinngang"
@@ -18842,10 +18890,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr "Rediger huleinngang"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "Fjelltopp"
@@ -18853,10 +18901,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "Rediger fjelltopp"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr "Isbre"
@@ -18864,10 +18912,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr "Rediger isbre"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr "Vulkan"
@@ -18875,70 +18923,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr "Rediger vulkan"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr "Grenser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr "Nasjonal"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr "Rediger landegrense"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr "Fylkesgrense"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr "Rediger fylkesgrense"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr "Kommunegrense"
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr "Rediger kommunegrense"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr "Politisk"
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr "Rediger politisk grense"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr "Nasjonalpark"
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr "Rediger nasjonalparkgrense"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr "Bruk av grunn"
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "Tre"
@@ -18947,15 +18995,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "Rediger tre"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr "Botanisk navn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr "Skogsområde"
@@ -18964,5 +19012,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr "Rediger skogsområde"
@@ -18970,17 +19018,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr "barskog"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr "løvskog"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr "blandingsskog"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "Skog"
@@ -18989,14 +19037,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr "Rediger skog"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr "Rediger naturreservat"
@@ -19004,25 +19052,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr "Steinur"
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr "Rediger steinur"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr "Krattskog"
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr "Rediger krattskog"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr "Fjell"
@@ -19030,10 +19078,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr "Rediger fjell"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr "Beite"
@@ -19041,5 +19089,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr "Rediger beite"
@@ -19047,5 +19095,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr "Gårdstun"
@@ -19054,45 +19102,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr "Rediger gårdstun"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr "Åkerland"
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr "Rediger åkerland"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr "Eng"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr "Rediger eng"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr "Rediger vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr "Hageparseller"
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr "Rediger hageparseller"
@@ -19100,25 +19148,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr "Hage"
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr "Rediger hage"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr "Gress"
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr "Rediger gress"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr "Friområde"
@@ -19126,10 +19174,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr "Rediger friområde"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr "Offentlig"
@@ -19137,20 +19185,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr "Rediger offentlig"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr "Rediger park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr "Friluftsområde"
@@ -19158,5 +19206,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr "Rediger friluftsområde"
@@ -19164,15 +19212,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr "Boligområde"
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr "Rediger boligområde"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr "Gravlund"
@@ -19180,9 +19228,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr "Rediger gravlund"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr "Kirkegård"
@@ -19190,39 +19238,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr "Rediger kirkegård"
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr "Forretninger"
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr "Rediger forretninger"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr "Næringsområde"
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr "Rediger næringsområde"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr "Industriområde"
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr "Rediger industriområde"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr "Jernbanegrunn"
@@ -19230,15 +19278,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr "Rediger jernbanegrunn"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr "Millitært"
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr "Rediger millitært"
@@ -19246,55 +19294,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr "Byggeplass"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr "Rediger byggeplass"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr "Rivningsområde"
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr "Rediger rivningsområde"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr "Byggeområde"
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr "Rediger byggeområde"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr "Avfallsdeponi"
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr "Rediger avfallsdeponi"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr "Steinbrudd"
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr "Rediger steinbrudd"
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -19304,5 +19352,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr "Rediger multipolygon"
@@ -19311,10 +19359,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr "ytre linjesegment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr "indre linjesegment"
@@ -19322,5 +19370,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr "Svingeforbud"
@@ -19329,5 +19377,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr "Rediger svingeforbud"
@@ -19335,34 +19383,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr "Forbud"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr "venstresving forbudt"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr "høyresving forbudt"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr "rett frem forbudt"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr "u-sving forbudt"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr "påbudt høyresving"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr "påbudt venstresving"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr "påbudt rett frem"
@@ -19371,15 +19419,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr "fra linje"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr "via node eller linje"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr "til linje"
@@ -19387,5 +19435,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr "Rute"
@@ -19394,5 +19442,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr "Rediger rute"
@@ -19400,5 +19448,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr "Rutetype"
@@ -19470,24 +19518,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr "sykkel"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr "vei"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr "ferge"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr "ski"
@@ -19540,20 +19588,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr "fotgjenger"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr "tur"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr "trikk"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr "omkjøring"
@@ -19567,10 +19615,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr "T-bane"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr "Symbolforklaring"
@@ -19578,26 +19626,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr "Nettverk"
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "Rutetype"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr "planlagt"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr "alternativ"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr "midlertidig"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr "forbindelse"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr "Farge (hex)"
@@ -19606,30 +19660,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr "rutesegment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr "neste segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr "forrige segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr "stoppepunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr "neste stoppunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr "forrige stoppunkt"
@@ -19665,6 +19719,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19680,5 +19735,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19697,5 +19760,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr "standard"
@@ -19789,7 +19852,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr "bro"
@@ -20054,15 +20117,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr "uønsket"
@@ -20104,5 +20167,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr "hest"
@@ -20240,4 +20303,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20249,5 +20318,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20255,5 +20324,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20290,5 +20359,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20312,11 +20381,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr "hinder"
@@ -20340,5 +20409,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20379,5 +20448,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20415,6 +20484,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr "gate"
@@ -20470,7 +20539,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr "ferdselsvei – traktorvei"
@@ -20523,11 +20592,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr "jernbane"
@@ -20548,5 +20625,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr "service"
@@ -20560,5 +20637,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr "vadested"
@@ -20579,5 +20656,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr "vendesirkel"
@@ -20591,6 +20668,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr "redningsmøtepunkt"
@@ -20605,5 +20682,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr "elvebredd"
@@ -20617,5 +20694,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr "bekk"
@@ -20629,5 +20706,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr "tørrdokk"
@@ -20655,5 +20732,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr "akvadukt"
@@ -20796,5 +20873,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20821,13 +20898,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr "menneskeskapt"
@@ -20889,7 +20966,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr "jernbanepunkt"
@@ -20912,10 +20989,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr "annen bane"
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr "jernbanebro"
@@ -20951,7 +21028,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr "nedlagt bane"
@@ -20996,6 +21073,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr "aeroway"
@@ -21009,5 +21086,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr "stasjon"
@@ -21029,5 +21106,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr "aeroway_dark"
@@ -21041,5 +21118,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr "aeroway_light"
@@ -21047,4 +21124,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21087,7 +21171,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr "aerialway"
@@ -21104,5 +21188,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr "nedfart enkel"
@@ -21117,5 +21201,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr "nedfart middels"
@@ -21130,5 +21214,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr "nedfart avansert"
@@ -21143,5 +21227,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr "nedfart ekspert"
@@ -21156,5 +21240,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr "nedfart friløp"
@@ -21169,5 +21253,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr "nedfart nybegynner"
@@ -21190,4 +21274,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -21198,4 +21289,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -21272,10 +21371,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr "kraft"
@@ -21289,5 +21389,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr "brygge"
@@ -21301,5 +21401,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr "rørgate"
@@ -21427,12 +21527,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr "fritid"
@@ -21446,5 +21546,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr "marina"
@@ -21516,8 +21616,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr "fasilitet"
@@ -21619,10 +21719,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr "fasilitet – trafikk"
@@ -21642,4 +21742,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21661,4 +21768,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21982,4 +22096,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -22006,24 +22128,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr "fasilitet – lys"
@@ -22055,6 +22185,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr "light_vann"
@@ -22115,8 +22245,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr "helse"
@@ -22469,26 +22599,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr "butikk"
@@ -22543,5 +22673,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22560,8 +22690,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr "hotell"
@@ -22711,9 +22841,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr "turisme"
@@ -22785,8 +22915,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr "historisk"
@@ -22857,8 +22987,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr "grønn"
@@ -22872,5 +23002,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr "steinbrudd"
@@ -22884,5 +23014,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr "avfallsdeponi"
@@ -22904,5 +23034,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr "vannmagasin"
@@ -22916,5 +23046,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr "skog"
@@ -22928,5 +23058,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr "gårdstun"
@@ -22949,5 +23079,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr "butikker"
@@ -22961,5 +23091,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr "industri"
@@ -22973,5 +23103,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr "rivningsområde"
@@ -22985,5 +23115,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr "byggeområde"
@@ -22997,5 +23127,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr "jernbanegrunn"
@@ -23052,7 +23182,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr "millitært"
@@ -23066,5 +23196,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr "gravlund"
@@ -23077,5 +23207,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr "fjelltopp"
@@ -23090,5 +23220,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr "isbre"
@@ -23102,5 +23232,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr "vulkan"
@@ -23155,8 +23285,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr "natur"
@@ -23170,5 +23300,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr "krattskog"
@@ -23182,5 +23312,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr "beiteområde"
@@ -23194,5 +23324,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr "skogsområde"
@@ -23206,5 +23336,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr "søle"
@@ -23218,5 +23348,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr "strand"
@@ -23294,8 +23424,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr "rute"
@@ -23343,7 +23473,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr "grense"
@@ -23485,10 +23615,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr "sted"
@@ -23536,6 +23666,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr "adresse"
@@ -23832,18 +23962,6 @@
 msgstr "Terraserver Urban"
 
-#~ msgid "Unknown file extension."
-#~ msgstr "Ukjent filtype."
-
 #~ msgid "Move"
 #~ msgstr "Flytt"
-
-#~ msgid "Invalid projection"
-#~ msgstr "Ugyldig kartprojeksjon"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Bytt til kartprojeksjonen {0}."
-
-#~ msgid "end"
-#~ msgstr "avslutt"
 
 #~ msgid "Some of the nodes are (almost) in the line"
@@ -23865,4 +23983,7 @@
 #~ msgid "unnamed"
 #~ msgstr "uten navn"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Ukjent filtype."
 
 #~ msgid "Oberpfalz Geofabrik.de"
@@ -24088,4 +24209,10 @@
 #~ "kobling."
 
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Bytt til kartprojeksjonen {0}."
+
+#~ msgid "Invalid projection"
+#~ msgstr "Ugyldig kartprojeksjon"
+
 #~ msgid "Adjust the position of the WMS layer"
 #~ msgstr "Juster posisjon til WMS laget"
@@ -24101,4 +24228,7 @@
 #~ msgid "image not loaded"
 #~ msgstr "Bilde er ikke lest inn"
+
+#~ msgid "end"
+#~ msgstr "avslutt"
 
 #~ msgid "Import TCX file as GPS track"
Index: /applications/editors/josm/i18n/po/nl.po
===================================================================
--- /applications/editors/josm/i18n/po/nl.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/nl.po	(revision 17069)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
-"PO-Revision-Date: 2009-08-04 10:38+0000\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
+"PO-Revision-Date: 2009-08-10 13:14+0000\n"
 "Last-Translator: Valentijn Sessink <valentijn@sessink.nl>\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: 2009-08-10 11:57+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -56,6 +56,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -100,6 +100,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "Fout"
@@ -112,5 +112,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "Niet-opgeslagen wijzigingen"
@@ -131,10 +131,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -151,15 +151,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -189,6 +189,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -218,5 +218,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -372,5 +372,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
 msgstr ""
@@ -454,9 +454,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -489,7 +489,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -574,37 +574,37 @@
 msgstr "{0} knopen in weg {1} overschrijdt het maximum aantal knopen {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "gegevens"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "Laag"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "selectie"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "conflict"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "download"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Inzoomen op {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Beeld inzoomen op {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -614,30 +614,30 @@
 msgstr "Beeld: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "Geen selectie om op in te zoomen."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "Geen conflicten om op in te zoomen"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "Wegen combineren."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "Verschillende wegen combineren tot één weg."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "Selecteer twee of meer wegen om te combineren."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr "Wegen combineren ondanks verschillende relaties?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -647,13 +647,13 @@
 "u zeker dat u ze wilt combineren?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "Toch combineren"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "Richting omkeren?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -663,10 +663,10 @@
 "de richting van enkele omkeren?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "Omkeren en combineren"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -674,20 +674,20 @@
 msgstr "Waarden voor alle conflicten invoeren."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Conflicten oplossen"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "{0} wegen combineren"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "Alle wegen zijn leeg"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -736,6 +736,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -757,6 +757,6 @@
 msgstr "Geselecteerde objecten verwijderen."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -766,5 +766,5 @@
 msgstr "Overschrijven?"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -896,7 +896,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "De gegevens naar een GPX-bestand exporteren."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -912,5 +911,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -928,5 +927,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -998,22 +997,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "Knopen samenvoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "Knopen in de oudste samenvoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "Minstens twee knopen selecteren om samen te voegen."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr "Knopen met verschillende relaties samenvoegen?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1023,9 +1022,9 @@
 "samenvoegen?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "Toch samenvoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -1033,5 +1032,5 @@
 "in gebruik is."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1285,7 +1284,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "Geen doorsnijdingen gevolgende. Er is niets veranderd."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1887,5 +1885,5 @@
 msgstr "Fouten tijdens download"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1897,5 +1895,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr ""
@@ -1934,11 +1932,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2080,5 +2078,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2155,5 +2153,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Naar objecten zoeken."
@@ -2280,5 +2278,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Zoeken"
@@ -2480,5 +2478,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2521,5 +2519,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr "Uit relatie verwijderen"
@@ -2561,9 +2559,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "{0} knopen samenvoegen"
-msgstr[1] "{0} knopen samenvoegen"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2599,9 +2597,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "{0} knoop"
-msgstr[1] "{0} knopen"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2766,7 +2764,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "{0} object wijzigen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2776,5 +2774,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2821,5 +2819,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2852,5 +2850,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2864,5 +2862,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "spoorweg"
@@ -2877,5 +2875,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3160,5 +3158,5 @@
 msgstr "Niet meer tonen"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3167,5 +3165,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3175,10 +3173,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3186,25 +3184,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "onbekend"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3214,9 +3212,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3225,9 +3223,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "Er is een onverwachte fout opgetreden"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3237,9 +3247,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "Onbekende host"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3249,5 +3259,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr ""
@@ -3339,10 +3349,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "Gebruikersnaam"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "Wachtwoord"
@@ -3548,15 +3558,15 @@
 msgstr "(geen object)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "laag niet in lijst."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3613,5 +3623,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr "Mijn met Hun"
@@ -3620,5 +3630,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr "Mijn met Samengevoegd"
@@ -3627,20 +3637,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr "Hun met Samengevoegd"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3650,6 +3660,6 @@
 msgstr "Tags"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3657,6 +3667,6 @@
 msgstr "Knopen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3664,40 +3674,40 @@
 msgstr "Leden"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr "Geen tag-conflicten om op te lossen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "Tags ({0} conflicten)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr "{0} tag-conflicten om op te lossen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr "Knopen (opgelost)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "Knopen (met conflicten)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr "Conflicten in de knopen van deze weg"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "Leden (opgelost)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3705,74 +3715,74 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "Leden (met conflicten)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr "Vergelijk "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr "Mijn versie"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr "Samengevoegde versie"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3780,30 +3790,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr "Hun versie"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3811,5 +3821,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3817,13 +3827,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3831,5 +3841,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3837,21 +3847,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr "Geselecteerde elementen één positie omhoog schuiven"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr "Omlaag"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3860,27 +3870,27 @@
 msgstr "Verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3888,5 +3898,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3895,5 +3905,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3902,5 +3912,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3909,5 +3919,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -3916,21 +3926,21 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -3940,5 +3950,5 @@
 msgstr "parameter '{0}' mag niet leeg zijn"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -3948,5 +3958,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -3954,19 +3964,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr "Knoop"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -3975,19 +3985,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -3996,9 +4006,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -4008,13 +4018,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -4022,90 +4032,90 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr "Coördinaten:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr "(geen)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "verwijderd"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr "niet verwijderd"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr "Mijn coördinaten houden"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr "Hun coördinaten houden"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4115,17 +4125,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4134,14 +4144,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4149,21 +4159,21 @@
 msgstr "Rol"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4171,14 +4181,14 @@
 msgstr "<ongedefinieerd>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4186,7 +4196,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4198,7 +4208,7 @@
 msgstr "Sleutel"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4211,45 +4221,45 @@
 msgstr "Waarde"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr ""
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ">"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4269,8 +4279,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4309,5 +4319,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4411,83 +4421,83 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "Lagen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "Een lijst met alle geladen lagen openen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "De geselecteerde laag verwijderen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr "Laag verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "Tonen/Verbergen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "Zichtbaarheid van een laag in- of uitschakelen."
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "De geselecteerde laag een rij omhoog verplaatsen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "De geselecteerde laag een rij omlaag verplaatsen."
@@ -4497,6 +4507,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4505,22 +4515,22 @@
 msgstr[1] "Dit verandert {0} objecten."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "Een lege waarde verwijdert de sleutel."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<verschillend>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "Waarden aanpassen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4528,5 +4538,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4535,40 +4545,40 @@
 msgstr[1] "Eigenschappen van {0} objecten aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "Selecteer een sleutel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "Selecteer een waarde"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 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/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "Eigenschappen/Lidmaatschappen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "Eigenschappen voor geselecteerde objecten."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "Lid van"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "Eigenschappen toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4585,39 +4595,39 @@
 msgstr "Toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 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/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "Eigenschappen bewerken"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 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/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Eigenschappen: {0} / Leden: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "Eigenschappen / Leden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "Relatie wijzigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Selectie uit relatie {0} zeker verwijderen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "De geselecteerde sleutel in alle objecten verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "Eigenschappen verwijderen"
@@ -4629,5 +4639,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "Relaties"
@@ -4659,31 +4669,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "Huidige selectie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "Een selectielijstscherm openen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "Naar de geselecteerde element(en) zoomen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "De geselecteerde lijst herladen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "Op selectie inzoomen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Sel.: Rel.:{0} / Wegen:{1} / Knopen:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4691,5 +4701,5 @@
 msgstr "Selectie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4698,5 +4708,5 @@
 msgstr[1] "{0} wegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4705,5 +4715,5 @@
 msgstr[1] "{0} relaties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -4915,7 +4925,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "De geselecteerde relatie verwijderen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -4998,5 +5007,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5239,5 +5248,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "Locaties"
@@ -5284,21 +5293,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "soort"
@@ -6098,72 +6107,515 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "Naam"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr "Afbeeldingen van {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr "GPX inlezen..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Geen tijd voor punt {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Kan tijd \"{0}\" van punt {1} x {2} niet lezen."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr "Geen afbeeldingen met een leesbare tijd gevonden."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "Lezen {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr "Geotagged afbeeldingen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS-start: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS-einde: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr "Huidige verschil: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr "Tijdzoneverschil: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "afbeelding"
+msgstr[1] "afbeeldingen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} binnen de track."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "Klok synchroniseren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG-afbeeldingen (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "De datum in het bestand \"{0}\" kon niet ontleed worden."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Er bevindt zich geen EXIF-tijd in het bestand \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "Afbeelding"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Voer weergegeven datum in (mm/dd/jjjj UU:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr "Tijdzone GPS-unit (verschil t.o.v. de foto)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr "Syncroniseer tijd met GPS-apparaat"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr "Ingevoerde tijd kon niet worden ontleed."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr "GPS-punt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "Lijntekening aanpassen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr "Algemene instellingen gebruiken."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr "Lijnen tussen punten in deze laag tekenen."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr "Geen lijnen tussen punten in deze laag tekenen."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr "Lijntekenopties selecteren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "Kleur aanpassen"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Standaard"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Kies een kleur"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr "Markers van benoemde punten"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Benoemde trackpunten van {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "Geluid importeren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave-geluidsbestanden (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Geluidsmarkers van {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "Afbeeldingen importeren"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} track, "
+msgstr[1] "{0} tracks, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} route, "
+msgstr[1] "{0} routes, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} waypoint"
+msgstr[1] "{0} waypoints"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr "Naam: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr "Beschrijving: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr "Tijdsperiode: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr "Lengte: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "Naar gegevenslaag omzetten"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+msgid ""
+"<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 "
+"zijn.<br>Als je sporen wilt uploaden, kijk dan hier:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Omgezet van: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr "Uit OSM langs deze track downloaden"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr "Alles downloaden binnen:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr "{0} meters"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr "Maximum oppervlak per verzoek:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km2"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Deze opdracht heeft {0} losse downloadverzoeken<br>nodig. Wil je "
+"verder<br>gaan?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr "Geen GPX-track in laag beschikbaar om geluid mee te koppelen."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"Sommige waypoints met tijdmarkeringen van vóór de start of na het einde van "
+"de track zijn overgeslagen of naar de start verplaatst."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Enkele waypoints, die te ver van de track liggen om hun tijd zinnig te "
+"kunnen schatten, zijn overgeslagen."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Gegevenslaag {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr "buiten gedownload gebied"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr "versie {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} bestaat uit:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} verwijderd.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr "API-versie: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr "Naar GPX-laag omzetten"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6172,7 +6624,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6182,448 +6634,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "Naam"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr "Afbeeldingen van {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr "GPX inlezen..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Geen tijd voor punt {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Kan tijd \"{0}\" van punt {1} x {2} niet lezen."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr "Geen afbeeldingen met een leesbare tijd gevonden."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Lezen {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr "Geotagged afbeeldingen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS-start: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS-einde: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr "Huidige verschil: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr "Tijdzoneverschil: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "afbeelding"
-msgstr[1] "afbeeldingen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} binnen de track."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "Klok synchroniseren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG-afbeeldingen (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "De datum in het bestand \"{0}\" kon niet ontleed worden."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Er bevindt zich geen EXIF-tijd in het bestand \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "Afbeelding"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Voer weergegeven datum in (mm/dd/jjjj UU:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr "Tijdzone GPS-unit (verschil t.o.v. de foto)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr "Syncroniseer tijd met GPS-apparaat"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr "Ingevoerde tijd kon niet worden ontleed."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr "GPS-punt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "Lijntekening aanpassen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "Algemene instellingen gebruiken."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr "Lijnen tussen punten in deze laag tekenen."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr "Geen lijnen tussen punten in deze laag tekenen."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr "Lijntekenopties selecteren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "Kleur aanpassen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Standaard"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Kies een kleur"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr "Markers van benoemde punten"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Benoemde trackpunten van {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "Geluid importeren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave-geluidsbestanden (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Geluidsmarkers van {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "Afbeeldingen importeren"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} track, "
-msgstr[1] "{0} tracks, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} route, "
-msgstr[1] "{0} routes, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} waypoint"
-msgstr[1] "{0} waypoints"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr "Naam: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr "Beschrijving: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr "Tijdsperiode: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr "Lengte: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "Naar gegevenslaag omzetten"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-msgid ""
-"<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 "
-"zijn.<br>Als je sporen wilt uploaden, kijk dan hier:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Omgezet van: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr "Uit OSM langs deze track downloaden"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr "Alles downloaden binnen:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr "{0} meters"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr "Maximum oppervlak per verzoek:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km2"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Deze opdracht heeft {0} losse downloadverzoeken<br>nodig. Wil je "
-"verder<br>gaan?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr "Geen GPX-track in laag beschikbaar om geluid mee te koppelen."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-"Sommige waypoints met tijdmarkeringen van vóór de start of na het einde van "
-"de track zijn overgeslagen of naar de start verplaatst."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Enkele waypoints, die te ver van de track liggen om hun tijd zinnig te "
-"kunnen schatten, zijn overgeslagen."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Gegevenslaag {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr "buiten gedownload gebied"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr "versie {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} bestaat uit:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} verwijderd.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr "API-versie: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr "Naar GPX-laag omzetten"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -7016,5 +7025,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "Auto"
@@ -7031,16 +7040,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "Fiets"
@@ -7068,14 +7079,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "Te voet"
@@ -7298,19 +7312,19 @@
 msgstr "Taal"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr "Ingebouwde standaarden ingeschakelen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr ""
@@ -7440,36 +7454,11 @@
 msgstr "Wachtwoord proxyserver"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr "De basis-URL voor de OSM-server (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Wachtwoord van het OSM-account. Laat leeg om wachtwoord niet te bewaren."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "URL-basisserver"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "OSM-wachtwoord"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -7844,7 +7833,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "Kan \"{0}\" niet lezen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -7949,7 +7938,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "Onbekende rol \"{0}\"."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8107,23 +8096,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "Verkeerd wachtwoord of gebruikersnaam."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Waarschuwing: het wachtwoord wordt onversleuteld verstuurd."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "Gebruikersnaam en wachtwoord opslaan (onversleuteld)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "Voer wachtwoord in"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
 msgstr "Login"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr ""
+"Wachtwoord van het OSM-account. Laat leeg om wachtwoord niet te bewaren."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "OSM-wachtwoord"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -8286,14 +8300,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "Onbekend lidtype voor \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "OSM-gegevens voorbereiden..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr "Misvormde knoop-id"
@@ -8749,5 +8763,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr "Beschrijving"
@@ -9163,5 +9177,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr "Laden bestand is mislukt"
@@ -9411,5 +9425,4 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
-#, fuzzy
 msgid ""
 "To enable the cadastre WMS plugin, change\n"
@@ -9417,6 +9430,4 @@
 "projection and retry"
 msgstr ""
-"Verander de JOSM-projectie en herstart om\n"
-"de kadaster-WMS-plugin in te schakelen."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9509,5 +9520,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -10048,7 +10059,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr "water"
@@ -10232,7 +10243,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "naam"
+msgstr ""
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10794,12 +10804,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "Begin"
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0} knoop"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -10937,5 +10947,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr "Straatnaam"
@@ -11776,7 +11786,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr "gebouw"
@@ -11790,5 +11800,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr "gebied"
@@ -12025,12 +12035,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "Selecteer een rij om te bewerken."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "Laag verwijderen"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
@@ -12043,7 +12051,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "Geen aanpassingen aanwezig om te uploaden."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -12057,19 +12064,19 @@
 "Dat kan tot foutieve coördinaten leiden."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr "Automatisch downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS-laag ({0}), automatisch in zoom {1} downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS-laag ({0}), in zoom {1} downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -12077,42 +12084,42 @@
 "Het gevraagde gebied is te groot. Zoom iets in of verander de resolutie"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr "Zichtbare tegels downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr "Resolutie veranderen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr "Foutieve tegels herladen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr "WMS-laag in bestand opslaan"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr "WMS-laag uit bestand laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Niet-ondersteunde WMS-bestandsversie; is {0}, verwachtte {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr "Fout in bestandsindeling"
@@ -12445,4 +12452,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12479,5 +12488,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr "Straten"
@@ -12488,5 +12497,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Autosnelweg"
@@ -12495,5 +12504,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr "Een snelweg bewerken"
@@ -12520,8 +12529,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr "Referentie"
@@ -12562,21 +12571,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr "laag"
@@ -12590,8 +12599,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr "Lanen"
@@ -12609,15 +12618,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr "Max. snelheid (km/u)"
@@ -12654,16 +12663,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr "Éénrichtingsweg"
@@ -12705,19 +12714,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Brug"
@@ -12753,19 +12762,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -12799,18 +12808,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr "Verdieping"
@@ -12844,18 +12853,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr "Verhoging"
@@ -12863,5 +12872,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr "Autosnelwegverbinding"
@@ -12870,5 +12879,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr "Een autosnelwegverbinding bewerken"
@@ -12876,5 +12885,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr "Autoweg"
@@ -12883,5 +12892,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr "Een autoweg bewerken"
@@ -12891,6 +12900,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr ""
@@ -12898,5 +12907,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr "Autowegverbinding"
@@ -12905,5 +12914,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr "Een autowegverbinding bewerken"
@@ -12916,5 +12925,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Provinciale hoofdweg"
@@ -12923,5 +12932,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr "Een S-weg bewerken"
@@ -12929,10 +12938,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr "S-wegverbinding"
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr "Een S-wegverbinding bewerken"
@@ -12944,5 +12953,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "N-weg>400"
@@ -12952,5 +12961,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr "Een provinciale weg bewerken"
@@ -12958,5 +12967,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr "Tweebaansweg"
@@ -12966,5 +12975,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr "Een tweebaansweg bewerken"
@@ -12976,5 +12985,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Ongeklassificeerd"
@@ -12984,5 +12993,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr "Een enkelbaansweg bewerken"
@@ -13009,19 +13018,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr "Breedte (meters)"
@@ -13033,5 +13042,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Woongebied"
@@ -13040,5 +13049,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr "Een straat bewerken"
@@ -13062,13 +13071,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr "Oppervlakte"
@@ -13088,20 +13097,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr "verhard"
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr "onverhard"
@@ -13109,12 +13118,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr "kinderhoofdjes"
@@ -13122,5 +13131,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr "Woonerf"
@@ -13129,5 +13138,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr "Een woonerf bewerken"
@@ -13135,5 +13144,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr "Toegangsweg"
@@ -13142,5 +13151,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr "Een toegangsweg bewerken"
@@ -13150,18 +13159,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr "oprit"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr ""
@@ -13169,5 +13178,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr "Parkeergang"
@@ -13177,5 +13186,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr "Een parkeergang bewerken"
@@ -13183,5 +13192,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr "Weg (onbekend soort)"
@@ -13190,5 +13199,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr "Een weg van onbekend soort bewerken"
@@ -13197,20 +13206,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr "Toegangsbeperkingen"
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr "Toegangsbeperkingen bewerken"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr "Tol"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr "Doodlopende weg"
@@ -13223,8 +13232,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr "Toegang"
@@ -13268,23 +13277,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr "ja"
@@ -13297,40 +13306,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr "privé"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr "bestemmingsverkeer"
@@ -13343,19 +13352,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr "bestemming"
@@ -13378,65 +13387,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr "toestemming"
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr "landbouw"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr "nee"
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr "Goederen"
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Zwaar vrachtverkeer"
@@ -13451,10 +13460,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr "Ruiters"
@@ -13470,13 +13479,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr "Motorfiets"
@@ -13492,30 +13501,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr "Gemotoriseerd verkeer"
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr "Openbaar vervoer"
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr "Motorboot"
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr "Pleziervaart"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr "Min. snelheid (km/u)"
@@ -13523,25 +13532,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr "Max. gewicht (tonnen)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr "Max. hoogte (meters)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr "Max. breedte (meters)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr "Max. lengte (meters)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr "Rotonde"
@@ -13552,5 +13561,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr "Een splitsing bewerken"
@@ -13572,9 +13581,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr "Soort"
@@ -13594,10 +13603,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr "Autosnelweg"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr "op- en afrit autosnelweg"
@@ -13619,10 +13628,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr "autoweg"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr "op- en afrit autoweg"
@@ -13644,10 +13653,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr "provinciale weg"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr "op- en afrit provinciale weg"
@@ -13669,6 +13678,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr "N-weg"
@@ -13682,9 +13691,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr "weg buiten bebouwde kom"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr "niet geklassificeerd"
@@ -13698,9 +13707,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr "woongebied"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr "woonerf"
@@ -13730,10 +13739,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr "toegangsweg"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr "busbaan"
@@ -13741,4 +13750,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13756,6 +13772,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr "werkzaamheden"
@@ -13766,10 +13782,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr "Een brug bewerken"
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr "Een tunnel bewerken"
@@ -13777,19 +13793,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr "Wegen"
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr "Werkzaamheden"
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr "Een autosnelweg met werkzaamheden bewerken"
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr "Splitsing"
@@ -13805,5 +13821,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr "rotonde"
@@ -13812,5 +13828,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr "Ruiterpad"
@@ -13818,5 +13834,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr "Ruiterpad bewerken"
@@ -13824,5 +13840,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr "Fietspad"
@@ -13832,5 +13848,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr "Fietspad bewerken"
@@ -13838,5 +13854,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr "Voetpad"
@@ -13845,5 +13861,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr "Voetpad bewerken"
@@ -13851,5 +13867,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr "Voetgangers"
@@ -13858,5 +13874,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr "Voetgangerszone bewerken"
@@ -13864,5 +13880,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr "Trap"
@@ -13872,5 +13888,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr "Trap bewerken"
@@ -13879,5 +13895,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr "Track"
@@ -13886,14 +13902,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr "Track bewerken"
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr "gravel"
@@ -13901,18 +13917,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr "gebied"
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr "gras"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr "zand"
@@ -13920,5 +13936,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr "Track (klasse 1)"
@@ -13927,5 +13943,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr "Klasse-1-track bewerken"
@@ -13933,5 +13949,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr "Track (klasse 2)"
@@ -13940,5 +13956,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr "Klasse-2-track bewerken"
@@ -13946,5 +13962,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr "Track (klasse 3)"
@@ -13953,5 +13969,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr "Klasse-3-track bewerken"
@@ -13959,5 +13975,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr "Track (klasse 4)"
@@ -13966,5 +13982,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr "Klasse-4-track bewerken"
@@ -13972,5 +13988,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr "Track (klasse 5)"
@@ -13979,5 +13995,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr "Klasse-5-track bewerken"
@@ -13986,5 +14002,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr "Pad"
@@ -13993,13 +14009,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr "Pad bewerken"
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr "Sneeuwscooter"
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr "Ski"
@@ -14007,5 +14023,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr "Wandelen"
@@ -14015,5 +14031,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr "Wandelen bewerken"
@@ -14021,5 +14037,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr "Bergwandelen"
@@ -14029,5 +14045,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr "Bergwandelen bewerken"
@@ -14035,5 +14051,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr "Bergwandelen (stevig)"
@@ -14043,5 +14059,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Bergwandelen (stevig) bewerken"
@@ -14049,5 +14065,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr "Bergklimmen"
@@ -14057,5 +14073,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr "Bergklimmen bewerken"
@@ -14063,5 +14079,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr "Bergklimmen (stevig)"
@@ -14071,5 +14087,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Bergklimmen (stevig) bewerken"
@@ -14077,5 +14093,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr "Bergklimmen (moeilijk)"
@@ -14085,5 +14101,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Bergklimmen (moeilijk) bewerken"
@@ -14091,10 +14107,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr "Waypoints"
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr "Snelwegkruising"
@@ -14102,15 +14118,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr "Snelwegkruising bewerken"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr "Diensten"
@@ -14118,5 +14134,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr "Rustplaats bewerken"
@@ -14151,14 +14167,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr "Bedrijf"
@@ -14167,5 +14183,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr "Verkeerslicht"
@@ -14175,5 +14191,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr "Soort voetgangersoversteekplaats"
@@ -14182,27 +14198,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr "zonder verkeerslichten"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr "verkeerslichten"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr "eiland"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr "ongemarkeerd"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr "Als ruiter oversteken"
@@ -14210,6 +14226,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr "Op de fiets oversteken"
@@ -14218,11 +14234,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr "Klaar-over"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -14230,30 +14246,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr "pelicaan"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr "Stop"
@@ -14261,5 +14277,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr "Voetgangersoversteekplaats"
@@ -14268,14 +14284,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr "Mini-rotonde"
@@ -14286,14 +14302,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr "Richting"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr "met de klok mee"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr "Draaicirkel"
@@ -14303,20 +14319,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr "Stadsgrens"
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr "Bord stadsgrens bewerken"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr "Tweede naam"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr "Snelheidscamera"
@@ -14324,5 +14340,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr "Praatpaal"
@@ -14330,5 +14346,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr ""
@@ -14336,5 +14352,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr ""
@@ -14343,10 +14359,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr "Doorwaadplek"
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr "Doorwaadplek bewerken"
@@ -14354,5 +14370,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr "Bergpas"
@@ -14360,5 +14376,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr "Bergpas bewerken"
@@ -14370,7 +14386,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr "Stijging"
@@ -14378,5 +14394,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr "Barrières"
@@ -14384,5 +14400,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr "Verkeerspaal"
@@ -14390,5 +14406,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr "Verkeerspaal bewerken"
@@ -14427,18 +14443,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr "Toegestaan verkeer:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr ""
@@ -14447,5 +14467,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr "Blok"
@@ -14453,5 +14473,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr "Wildrooster"
@@ -14459,10 +14479,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr "Wildrooster bewerken"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr "Bussluis"
@@ -14470,15 +14490,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr "Pennen"
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr "Spijkers bewerken"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr "Tolpoort"
@@ -14486,5 +14506,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr "Tolpoort bewerken"
@@ -14492,10 +14512,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr "Grenspost"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr "Grenspost bewerken"
@@ -14505,5 +14525,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr "Haag"
@@ -14512,5 +14532,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr "Hek"
@@ -14519,5 +14539,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr "Muur"
@@ -14525,5 +14545,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr "Stadsmuur"
@@ -14532,5 +14552,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr "Stutmuur"
@@ -14542,15 +14562,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr "Ingang"
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr "Ingang bewerken"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr "Poort"
@@ -14558,50 +14578,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr "Poort bewerken"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr "Slagboom"
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr "Slagboom bewerken"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr "Draadhek"
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr "Draadhek bewerken"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr "Botspoort"
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr "Botspoort bewerken"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr "Sluipdoorhek"
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr "Sluipdoorhek bewerken"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr "Overstap"
@@ -14609,15 +14629,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr "Overstap bewerken"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+#, fuzzy
+msgid "Turnstile"
+msgstr "Draaiplateau"
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "Overstap bewerken"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr "Gekoppelde deuren"
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr "Gekoppelde deuren bewerken"
@@ -14628,10 +14660,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr "Water"
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr "Bron"
@@ -14639,5 +14671,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr "Bron bewerken"
@@ -14645,5 +14677,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr "Sloot"
@@ -14651,10 +14683,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr "Sloot bewerken"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr "Stroom"
@@ -14662,10 +14694,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr "Stroom bewerken"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr "Kanaal"
@@ -14673,10 +14705,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr "Kanaal bewerken"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr "Rivier"
@@ -14686,5 +14718,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr "Rivier bewerken"
@@ -14692,15 +14724,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr "Water bewerken"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr "Land bewerken"
@@ -14708,15 +14740,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr "Estuarium"
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr "Estuarium bewerken"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr "Reservoir"
@@ -14724,15 +14756,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr "Reservoir bewerken"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr "Ondergronds reservoir"
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr "Ondergronds reservoir bewerken"
@@ -14740,5 +14772,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr "Rivierbank"
@@ -14747,10 +14779,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr "Rivierbank bewerken"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr "Drasland"
@@ -14761,14 +14793,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr "Drasland bewerken"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr "Moeras"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr "veen"
@@ -14782,35 +14814,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr "moeras"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr "rietveld"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr "Zoutwatermoeras"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr "slik"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr "mangroven"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr "Modder"
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr "Modder bewerken"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr "Strand"
@@ -14818,20 +14850,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr "Strand bewerken"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr "Baai"
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr "Baai bewerken"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr "Klif"
@@ -14839,10 +14871,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr "Klif bewerken"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr "Kustlijn"
@@ -14850,5 +14882,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr "Kustlijn bewerken"
@@ -14856,5 +14888,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr "Veerpontroute"
@@ -14862,5 +14894,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr "Veerpontroute bewerken"
@@ -14869,5 +14901,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr "Scheepswerf"
@@ -14875,10 +14907,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr "Scheepswerf bewerken"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr "Dok"
@@ -14886,5 +14918,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr "Dok bewerken"
@@ -14892,5 +14924,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr "Dam"
@@ -14898,15 +14930,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr "Dam bewerken"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr "Waterwegpunt"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr "Sluis"
@@ -14915,5 +14947,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr "Stuw"
@@ -14921,20 +14953,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr "Stuw bewerken"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr "Waterval"
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr "Waterval bewerken"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr "Zwaaiplaats"
@@ -14943,15 +14975,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr "Jachthaven"
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr "Jachthaven bewerken"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr "Pier"
@@ -14959,10 +14991,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr "Pier bewerken"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr "Veerbootterminal"
@@ -14970,10 +15002,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr "Veerbootterminal bewerken"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr "Trailerhelling"
@@ -14983,5 +15015,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr "Trailerhelling bewerken"
@@ -14989,10 +15021,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr "Spoorweg"
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr "Spoor"
@@ -15000,5 +15032,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr "Spoor bewerken"
@@ -15028,8 +15060,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr "Optionele soorten"
@@ -15043,35 +15075,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr "tuin"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr "nevenweg"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr "privéoprit"
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr "Smalspoor"
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr "Smalspoor bewerken"
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr "Monorail"
@@ -15079,45 +15111,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr "Monorail bewerken"
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr "Museumspoor"
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr "Een museumspoorweg bewerken"
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr "Sneltram"
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr "Sneltram bewerken"
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr "Metro"
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr "Metro bewerken"
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr "Tram"
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr "Tram bewerken"
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr "Busbaan"
@@ -15125,5 +15157,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr "Busbaan bewerken"
@@ -15132,14 +15164,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr "Ongebruikt spoor"
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr "Ongebruikt spoor bewerken"
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr "Verwijderd spoor"
@@ -15148,5 +15180,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr "Bewaakte spoorwegovergang"
@@ -15155,5 +15187,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr "Onbewaakte spporwegovergang"
@@ -15163,5 +15195,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr ""
@@ -15169,5 +15201,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr "Draaiplateau"
@@ -15176,10 +15208,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr "Kabelbaan"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr "Stoeltjeslift"
@@ -15187,10 +15219,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr "Stoeltjeslift bewerken"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr "Sleeplift"
@@ -15198,10 +15230,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr "Sleeplift bewerken"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr "Kabinebaan"
@@ -15209,10 +15241,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr "Kabinebaan bewerken"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr ""
@@ -15220,5 +15252,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr ""
@@ -15226,5 +15258,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr "Station"
@@ -15235,10 +15267,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr "Station bewerken"
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr "Brandstof"
@@ -15248,5 +15280,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr "Brandstof bewerken"
@@ -15262,5 +15294,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15270,5 +15302,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr "Parkeerplaats bewerken"
@@ -15276,41 +15308,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr "Capaciteit"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr "oppervlak"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr "meerlaags"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr "ondergronds"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr "Parkeer en Reis"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr "Gehandicaptenplaats"
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr "Parkeergeld"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr "Wasstraat"
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr "Autowasstraat bewerken"
@@ -15318,5 +15350,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr "Winkel"
@@ -15324,15 +15356,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr "Winkel met autoonderdelen bewerken"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr "Garage"
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr "Autogarage bewerken"
@@ -15340,5 +15372,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr "Verhuur"
@@ -15347,10 +15379,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr "Autoverhuur bewerken"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr "Autodelen"
@@ -15358,5 +15390,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr "Autodelen bewerken"
@@ -15364,5 +15396,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr "Fietsenstalling bewerken"
@@ -15371,5 +15403,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr "Fietsenverhuur bewerken"
@@ -15378,15 +15410,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr "Fietswinkel bewerken"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "Openbaar vervoer"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr "UIC-referentie"
@@ -15394,5 +15426,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr "Onbemand station"
@@ -15400,5 +15432,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr "Onbemand station bewerken"
@@ -15406,5 +15438,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr "Tramhalte"
@@ -15413,5 +15445,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr "Tramhalte bewerken"
@@ -15419,5 +15451,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr "Perron"
@@ -15426,5 +15458,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr "Perron bewerken"
@@ -15436,5 +15468,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr "Referentie (tracknummer)"
@@ -15442,10 +15474,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr "Gebied"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr "Metroingang"
@@ -15454,10 +15486,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr "Metroingang bewerken"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr "Rolstoel"
@@ -15466,5 +15498,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr "Busstation"
@@ -15473,5 +15505,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr "Busstation bewerken"
@@ -15479,5 +15511,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr "Bushalte"
@@ -15487,5 +15519,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr "Bushalte bewerken"
@@ -15496,6 +15528,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr "Schuilplaats"
@@ -15503,10 +15535,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr "Busstation"
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr "Busplatform bewerken"
@@ -15514,5 +15546,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr "Taxi"
@@ -15520,5 +15552,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr "Taxistandplaats bewerken"
@@ -15526,5 +15558,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr "Luchthaven"
@@ -15532,15 +15564,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr "ICAO"
@@ -15549,5 +15581,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr "Accomodatie"
@@ -15559,5 +15591,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -15566,15 +15598,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr "Hotel bewerken"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr "Sterren"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr "Motel"
@@ -15582,20 +15614,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr "Motel bewerken"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr "Pension"
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr "Pension bewerken"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr "Chalet"
@@ -15603,10 +15635,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr "Chalet bewerken"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr "Hostel"
@@ -15614,30 +15646,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr "Hostel bewerken"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr "Berghut"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr "Berghut bewerken"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr "Caravanpark"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr "Caravanpark bewerken"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr "Kampeerterrein"
@@ -15645,10 +15677,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr "Kampeerterrein bewerken"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "Eten en drinken"
@@ -15659,5 +15691,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -15665,5 +15697,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr "Restaurant bewerken"
@@ -15671,5 +15703,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr "Keuken"
@@ -15677,61 +15709,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr "Italiaanse keuken"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr "Chinese keuken"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr "Grieks"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr "Duits"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr "Indiaas"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr "lokaal"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr "Kebab"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr "Turks"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr "Oosters"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr "Thais"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr "Mexicaans"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr "Japans"
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -15739,9 +15771,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr "Fast-Food-restaurant bewerken"
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr "Café"
@@ -15749,10 +15781,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr "Café bewerken"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr "Kroeg"
@@ -15760,20 +15792,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr "Kroeg bewerken"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr "Biergarten bewerken"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr ""
@@ -15781,10 +15813,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr "Nachtclub"
@@ -15792,20 +15824,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr "Nachtclub bewerken"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "Toerisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr "Attractie"
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr "Attractie bewerken"
@@ -15814,11 +15846,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr "Openingstijden"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "Museum"
@@ -15826,10 +15858,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr "Museum bewerken"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "Dierentuin"
@@ -15838,10 +15870,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr "Dierentuin bewerken"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr "Uitkijkpunt"
@@ -15849,25 +15881,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr "Uitkijkpunt bewerken"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr "Uitkijktoren"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr "Themapark"
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr "Themapart bewerken"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr "Kunstwerk"
@@ -15875,5 +15907,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr "Kunstwerk bewerken"
@@ -15881,5 +15913,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr ""
@@ -15887,80 +15919,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr ""
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "Kaart"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr ""
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr "kaart"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr "stadskaart"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr "wandelkaart"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr "fietskaart"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
 msgid "Closer Description"
 msgstr ""
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1701
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Board Type"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "board"
 msgstr "bord"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "history"
 msgstr "geschiedenis"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "nature"
 msgstr "natuur"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "wildlife"
 msgstr "Wild"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Guidepost (Hiking)"
 msgstr ""
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr "Schuilplaats bewerken"
@@ -15968,25 +16000,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr "Vuurplaats"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr "Picnicplek"
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr "Picnicplek bewerken"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "Historische locaties"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "Kasteel"
@@ -15995,20 +16027,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr "Kasteel bewerken"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "Ruïne"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr "Ruïne bewerken"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr "Archeologische plaats"
@@ -16017,10 +16049,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr "Archeologische plaats bewerken"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr "Slagveld"
@@ -16028,5 +16060,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr "Slagveld bewerken"
@@ -16034,15 +16066,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr "Monument bewerken"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr "Herdenkingsplek"
@@ -16050,45 +16082,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr "Herdenkingsplek bewerken"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr "Kruis langs de weg"
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr "Kruis langs de weg bewerken"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr "Kapelletje langs de weg"
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr "Kapelletje bewerken"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "Vrije tijd"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr "Zwembad"
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr "Zwembad bewerken"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "Speelveld"
@@ -16096,15 +16128,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr "Speelveld bewerken"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "Visstek"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr "Visstek bewerken"
@@ -16112,15 +16144,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr "Sportfaciliteiten"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr "Stadion bewerken"
@@ -16134,6 +16166,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "sport selecteren:"
@@ -16156,4 +16188,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -16214,5 +16254,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16222,5 +16270,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16366,5 +16414,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16470,5 +16518,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16509,29 +16557,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr "sport"
@@ -16541,227 +16590,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr "Meervoudig"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr "Boogschieten"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr "Atletiek"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr "Australisch football"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr "Honkbal"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr "Basketball"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr "Boules"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr "Bowling"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr "Kanoën"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr "Klimmen"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr "Cricket"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr "Cricket netten"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr "Croquet"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr "Fietsen"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr "Hondenraces"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr "Paardensport"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr "Football"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr "Golf"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr "Turnen"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr "Hockey"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr "Paardenraces"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr "Motorsport"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr "Pelota"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr "Badminton"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr "Rugby"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr "Schieten"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr "Skateboarden"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr "Schaatsen"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr "Skiën"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "Voetbal"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr "Zwemmen"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "Tafeltennis"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr "Tennis"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr "Sportcentrum"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr "Sportcentrum bewerken"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr "Sportveld"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr "Sportveld bewerken"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr "Wedstrijdbaan"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr "Wedstrijdbaan bewerken"
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr "Golfbaan"
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr "Golfbaan bewerken"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr "Minigolf bewerken"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr "Verzameling"
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr "Verzameling bewerken"
@@ -16800,191 +16849,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr "Sportveld"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr "Sportcentrum"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr "Stadion"
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr "Atletiek"
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr "Atletiek bewerken"
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr "Boogschieten"
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr "Boogschieten bewerken"
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr "Klimmen"
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr "Klimmen bewerken"
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr "Kanoën"
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr "Kanoën bewerken"
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr "Fietsen"
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr "Fietsen bewerken"
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr "Hondenracen"
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr "Hondenracen bewerken"
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr "Paardenracen"
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr "Paardenracen bewerken"
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr "Turnen"
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr "Turnen bewerken"
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr "Motorracen"
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr "Motorracen bewerken"
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr "Schaatsen"
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr "Schaatsen bewerken"
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr "Skateboard bewerken"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr "Zwemmen"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr "Zwemmen bewerken"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr "Skiën"
@@ -16992,56 +17041,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr "Skiën bewerken"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr "Soort piste"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr "bergafwaarts"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr "Scandinavisch"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr "Moeilijkheidsgraad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr "beginner"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr "eenvoudig"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr "Schieten"
@@ -17049,178 +17098,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr "Schieten bewerken"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr "Balsporten"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr "Voetbal"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr "Voetbal bewerken"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr "Football"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr "Football bewerken"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr "Australisch football"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr "Australisch football bewerken"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr "Honkbal"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr "Honkbal bewerken"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr "Basketball bewerken"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr "Golf bewerken"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr "golfbaan"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr "Boule bewerken"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr "Bowlen"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr "Bowlen bewerken"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr "Cricket bewerken"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr "Cricketnetten"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr "Cricketnetten bewerken"
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr "Croquet bewerken"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr "Hockey bewerken"
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr "Pelota bewerken"
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr "Badminton"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr "Badminton bewerken"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr "Rugby bewerken"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr "Tafeltennis"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr "Tafeltennis bewerken"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr "Tennis bewerken"
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "Gebouwen"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr "Gebouw"
@@ -17228,5 +17277,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "Openbare gebouw"
@@ -17234,10 +17283,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr "Openbare gebouwen bewerken"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "Stadhuis"
@@ -17245,10 +17294,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "Stadhuis bewerken"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "Ambassade"
@@ -17256,10 +17305,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "Ambassade bewerken"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "Gerechtsgebouw"
@@ -17268,10 +17317,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "Gerechtsgebouw bewerken"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "Gevangenis"
@@ -17280,10 +17329,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "Gevangenis bewerken"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "Politie"
@@ -17293,10 +17342,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "Politie bewerken"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "Brandweerkazerne"
@@ -17305,10 +17354,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "Brandweerkazerne bewerken"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "Postkantoor"
@@ -17316,5 +17365,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr "Postkantoor bewerken"
@@ -17322,15 +17371,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr "Kinderopvang"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr "Kinderopvang bewerken"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "School"
@@ -17338,10 +17387,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "School bewerken"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr "Universiteit"
@@ -17349,10 +17398,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr "Universiteit bewerken"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr "Campus"
@@ -17360,5 +17409,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr "Campus bewerken"
@@ -17366,5 +17415,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "Bioscoop"
@@ -17373,10 +17422,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "Bioscoop bewerken"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "Bibliotheek"
@@ -17385,10 +17434,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "Bibliotheek bewerken"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr "Kunstcentrum"
@@ -17396,10 +17445,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr "Kunstcentrum bewerken"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "Theater"
@@ -17408,10 +17457,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "Theater bewerken"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr "Religieus gebouw"
@@ -17421,5 +17470,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr "Religieus gebouw bewerken"
@@ -17428,6 +17477,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr "Religie"
@@ -17436,66 +17485,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr "Bahai"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr "Boeddhisme"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr "Christelijk"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr "Hindoestaans"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr "Jain"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr "Joods"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr "Moslim"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr "Sikh"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr "Spirtualist"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr "Taoist"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr "Benaming"
@@ -17504,81 +17553,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr "Anglicaan"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr "Baptist"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr "Katholiek"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr "Evangelist"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr "Jehovahs getuigen"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr "Luthers"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr "Methodist"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr "Mormoon"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr "Orthodox"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr "Protestant"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr "Quaker"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr "Adressen"
@@ -17587,5 +17636,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr "Adresinformatie bewerken"
@@ -17593,5 +17642,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr "Huisnummer"
@@ -17599,20 +17648,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr "Huisnaam"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr "Stadsnaam"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "Postcode"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr "Landcode"
@@ -17620,5 +17669,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr "Adresinterpolatie"
@@ -17627,5 +17676,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr "Adresinterpolatie bewerken"
@@ -17633,71 +17682,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr "Nummeringschema"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr "oneven"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr "even"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr "alles"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr "Bouwwerken"
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr "Fabriek"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr "Fabriek bewerken"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "Toren"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "Toren bewerken"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "Watertoren"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "Watertoren bewerken"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr "Olieopslag"
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr "Olieopslag bewerken"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "Vuurtoren"
@@ -17705,10 +17754,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "Vuurtoren bewerken"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "Windmolen"
@@ -17716,10 +17765,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "Windmolen bewerken"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "Pijplijn"
@@ -17727,10 +17776,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "Pijplijn bewerken"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr "Afvalzuivering"
@@ -17740,10 +17789,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr "Afvalzuivering bewerken"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr "Kraan"
@@ -17751,10 +17800,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr "Kraan bewerken"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr "Baken"
@@ -17762,10 +17811,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr "Baken bewerken"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr "Uitkijkpunt"
@@ -17773,10 +17822,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr "Uitkijkpunt bewerken"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr "Bewakingscamera"
@@ -17784,5 +17833,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr "Bewakingscamera bewerken"
@@ -17790,5 +17839,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr "Energievoorziening"
@@ -17798,39 +17847,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr "Energievoorziening bewerken"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr "water"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr "fossiele brandstoffen"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr "nucleair"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr "kolen"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr "fotovoltage"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr "gas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr "Verdeelstation"
@@ -17839,10 +17888,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr "Verdeelstation bewerken"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -17851,5 +17900,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr "Transformatorstation bewerken"
@@ -17857,10 +17906,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr "Lijnreferentie"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr "Hoogspanningsmast"
@@ -17871,5 +17920,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr "Hoogspanningsmast bewerken"
@@ -17877,5 +17926,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr "Hoogspanningskabel"
@@ -17884,25 +17933,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr "Hoogspanningskabels bewerken"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr "Voltage"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr "Hoeveelheid draden"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr "Voorzieningen"
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "Toiletten"
@@ -17910,20 +17959,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr "Referentienummer"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr "Opmerking"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr "Postbus"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "Telefoon"
@@ -17932,5 +17981,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr "Een telefoon bewerken"
@@ -17938,5 +17987,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "Munten"
@@ -17944,5 +17993,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr "Briefgeld"
@@ -17950,5 +17999,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr "Chipknip"
@@ -17956,5 +18005,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr "Pinpas"
@@ -17962,15 +18011,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "Creditkaart"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "Telefoonkaart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr "Recycling"
@@ -17979,5 +18028,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr "Recyclebakken"
@@ -17985,35 +18034,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr "Batterijen"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr "Flessen"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr "Kleding"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr "Schroot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr "Bank"
@@ -18022,20 +18071,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr "Vogeluitkijkpost"
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr "Vogeluitkijkpost bewerken"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr "Verborgen"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr "Afgesloten"
@@ -18043,22 +18092,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr "Hoogte"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr "Kruiphoogte"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr "Bukhoogte"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr "Stahoogte"
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr "Fontein"
@@ -18067,10 +18116,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr "Fontein bewerken"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "Drinkwater"
@@ -18079,10 +18128,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "Drinkwater bewerken"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr ""
@@ -18090,25 +18139,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "Winkels"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr "Supermarkt"
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr "Supermarkt bewerken"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr ""
@@ -18116,10 +18165,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr ""
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -18127,10 +18176,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr "Kiosk bewerken"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "Verkoopautomaat"
@@ -18138,5 +18187,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "Verkoopautomaat bewerken"
@@ -18144,88 +18193,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "Producten"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr "vervoerskaarten"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr "overzichtskaart"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr "parkeerbiljet"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr "voedsel"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "frisdranken"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr "snoepgoed"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr "sigaretten"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr "foto's"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr "diervoeder"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "kranten"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "speelgoed"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr "postzegels"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "SIM-kaarten"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr "prepaid-kaarten"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr "tegoedbonnen"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr "condooms"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr "hondenpoepzakjes"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr "Klantenkaarten"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "Slager"
@@ -18233,10 +18282,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "Slager bewerken"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "Bakker"
@@ -18244,10 +18293,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "Bakker bewerken"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr "Bloemist"
@@ -18255,20 +18304,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr "Bloemist bewerken"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr ""
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr ""
@@ -18276,60 +18325,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr ""
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr "Dranken"
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr ""
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr "Computer"
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr "Computerwinkel bewerken"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr "Elektronica"
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr "Elektronicawinkel bewerken"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr "Hifi-winkel bewerken"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr "Meubels"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr "Meubelzaak bewerken"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr "Tuincentrum"
@@ -18337,10 +18386,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr "Tuincentrum bewerken"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr ""
@@ -18348,10 +18397,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr "Doe-het-zelfzaak"
@@ -18359,60 +18408,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr "Doe-het-zelfzaak bewerken"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr "Kantoorartikelen"
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr "Kantoorartikelenwinkel bewerken"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr "Kapper"
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr "Kapper bewerken"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr "Schoenen"
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr "Schoenenwinkel bewerken"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr "Speelgoed"
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr "Speelgoedwinkel bewerken"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr "Videotheek"
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr "Videotheek bewerken"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "Stomerij"
@@ -18420,10 +18469,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "Stomerij bewerken"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "Wasserette"
@@ -18431,10 +18480,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "Wasserette bewerken"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr "Buitensport"
@@ -18442,35 +18491,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr "Buitensportzaak bewerken"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr "Sportzaak bewerken"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr "Opticiën bewerken"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "Geldzaken"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "Bank"
@@ -18478,5 +18527,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "Bank bewerken"
@@ -18484,10 +18533,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "Geldautomaat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr "Geldwisselkantoor"
@@ -18495,5 +18544,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr "Geldwisselkantoor bewerken"
@@ -18501,15 +18550,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "Geldautomaat bewerken"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "Gezondheid"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr "Huisarts"
@@ -18517,20 +18566,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr "Huisarts bewerken"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr "Tandarts"
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr "Tandarts bewerken"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "Apotheek"
@@ -18538,5 +18587,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "Apotheek bewerken"
@@ -18544,10 +18593,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "Ziekenhuis"
@@ -18555,10 +18604,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "Ziekenhuis bewerken"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr "EHBO-post"
@@ -18567,5 +18616,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr "EHBO-post bewerken"
@@ -18574,20 +18623,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr "Puntnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr "Telefoonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Gebruik de landtoegangscode, b.v. +31 20-3456789)"
@@ -18595,5 +18644,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr "Dierenarts"
@@ -18602,56 +18651,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr "Dierenarts bewerken"
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr "Continent"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr "Een continent bewerken"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr "Land bewerken"
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr "Provincie"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr "Provincie bewerken"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr "Regio"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr "Regio bewerken"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr ""
@@ -18659,15 +18707,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr "Stad"
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr "Stad bewerken"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr "Dorp"
@@ -18675,10 +18723,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr "Dorp bewerken"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr "Deelgemeente"
@@ -18686,25 +18734,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr "Deelgemeente bewerken"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "Klein dorp"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "Klein dorp bewerken"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr "Gehucht"
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr "Gehucht bewerken"
@@ -18712,5 +18760,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr ""
@@ -18718,10 +18766,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "Eiland"
@@ -18729,5 +18777,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "Eiland bewerken"
@@ -18735,5 +18783,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr "Grotingang"
@@ -18741,10 +18789,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr "Grotingang bewerken"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "Bergtop"
@@ -18752,10 +18800,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "Bergtop bewerken"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr "Gletsjer"
@@ -18763,10 +18811,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr "Gletsjer bewerken"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr "Vulkaan"
@@ -18774,70 +18822,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr "Vulkaan bewerken"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr "Grenzen"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr "Landsgrens"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr "Landsgrens bewerken"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr "Provincie -of gemeentegrens"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr "Provincie -of gemeentegrens bewerken"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr "Grens bebouwde kom"
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr "Grens bebouwde kom bewerken"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr "Grens kiesdistrict bewerken"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr "Grens Nationaal park bewerken"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr "Grondgebruik"
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "Boom"
@@ -18846,15 +18894,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "Boom bewerken"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr "Botanische naam"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr "Bos"
@@ -18863,5 +18911,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr "Bos bewerken"
@@ -18869,17 +18917,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr "naaldbomen"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr "loofbomen"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr "gemengd"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "Bosbouw"
@@ -18888,14 +18936,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr "Bosbouw bewerken"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr "Natuurreservaat"
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr "Natuurreservaat bewerken"
@@ -18903,25 +18951,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr "Puinhelling"
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr "Puinhelling bewerken"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr "Kreupelhout"
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr "Kreupelhout bewerken"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr ""
@@ -18929,10 +18977,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr "Heide"
@@ -18940,5 +18988,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr "Heide bewerken"
@@ -18946,5 +18994,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr "Boerenerf"
@@ -18953,45 +19001,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr "Boerenerf bewerken"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr "Landbouwgrond"
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr "Landbouwgrond bewerken"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr "Weide"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr "Weideland bewerken"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr "Wijngaard"
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr "Wijngaard bewerken"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr "Volkstuinen"
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr "Volkstuinen bewerken"
@@ -18999,25 +19047,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr "Tuin"
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr "Tuin bewerken"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr "Gras"
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr "Gras bewerken"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr "Stadsgroen"
@@ -19025,10 +19073,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr "Stadsgroen bewerken"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr "Algemeen"
@@ -19036,20 +19084,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr "Algemeen bewerken"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr "Park bewerken"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr "Recreatiegebied"
@@ -19057,5 +19105,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr "Recreatiegebied bewerken"
@@ -19063,15 +19111,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr "Woongebied"
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr "Woongebied bewerken"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr "Begraafplaats"
@@ -19079,9 +19127,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr "Begraafplaats bewerken"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr "Begraafplaats"
@@ -19089,39 +19137,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr "Begraafplaats bewerken"
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr "Winkelcentrum"
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr "Winkelcentrum bewerken"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr "Kantoren"
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr "Kantoren bewerken"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr "Industrieterrein"
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr "Industrieterrein bewerken"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr ""
@@ -19129,15 +19177,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr "Militair terrein"
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr "Militair terrein bewerken"
@@ -19145,55 +19193,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr "Bouwterrein"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr "Bouwterrein bewerken"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr "Braakliggende grond"
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr "Braakliggende grond bewerken"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr "Ontwikkelingsgebied"
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr "Ontwikkelingsgebied bewerken"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr "Vuilstortplaats"
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr "Vuilstortplaats bewerken"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr "Mijnbouw"
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr "Mijnbouw bewerken"
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr "Multipolygoon"
@@ -19203,5 +19251,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr "Multipolygoon bewerken"
@@ -19210,10 +19258,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr "buitensegment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr "binnensegment"
@@ -19221,5 +19269,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr "Verkeersbeperking"
@@ -19228,5 +19276,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr "Verkeersbeperking bewerken"
@@ -19234,34 +19282,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr "Beperking"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr "niet linksaf"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr "niet rechtsaf"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr "niet rechtdoor"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr "niet keren"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr "alleen rechtsaf"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr "alleen linksaf"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr "alleen rechtdoor"
@@ -19270,15 +19318,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr "vanaf weg"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr "via knoop of weg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr "naar weg"
@@ -19286,5 +19334,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr ""
@@ -19293,5 +19341,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr ""
@@ -19299,5 +19347,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr ""
@@ -19369,24 +19417,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr "fiets"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr ""
@@ -19439,20 +19487,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr "voet"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr ""
@@ -19466,10 +19514,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr ""
@@ -19477,26 +19525,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr ""
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "Roteren"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr ""
@@ -19505,30 +19559,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr ""
@@ -19564,6 +19618,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19579,5 +19634,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19596,5 +19659,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr "standaard"
@@ -19688,7 +19751,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr "brug"
@@ -19953,15 +20016,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr "vervallen"
@@ -20003,5 +20066,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr "paard"
@@ -20139,4 +20202,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20148,5 +20217,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20154,5 +20223,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20189,5 +20258,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20211,11 +20280,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr ""
@@ -20239,5 +20308,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20278,5 +20347,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20314,6 +20383,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr "straat"
@@ -20369,7 +20438,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr "snelwegroute"
@@ -20422,11 +20491,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr "spoor"
@@ -20447,5 +20524,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr ""
@@ -20459,5 +20536,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr ""
@@ -20478,5 +20555,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr "Omkeermogelijkheid"
@@ -20490,6 +20567,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr ""
@@ -20504,5 +20581,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr "rivierbank"
@@ -20516,5 +20593,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr "stroom"
@@ -20528,5 +20605,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr "dok"
@@ -20554,5 +20631,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr "aquaduct"
@@ -20695,5 +20772,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20720,13 +20797,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr "kunstmatig"
@@ -20788,7 +20865,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr "spoorwegpunt"
@@ -20811,10 +20888,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr "ander spoor"
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr "spoorovergang"
@@ -20850,7 +20927,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr "oud spoor"
@@ -20895,6 +20972,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr "luchtverbinding"
@@ -20908,5 +20985,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr "terminal"
@@ -20928,5 +21005,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr "luchtverbinding_donker"
@@ -20940,5 +21017,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr "luchtverbinding_licht"
@@ -20946,4 +21023,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20986,7 +21070,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr "kabelbaan"
@@ -21003,5 +21087,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr "piste_eenvoudig"
@@ -21016,5 +21100,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr "piste_middelmatig"
@@ -21029,5 +21113,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr "piste_gevorderden"
@@ -21042,5 +21126,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr ""
@@ -21055,5 +21139,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr "piste_vrijekuur"
@@ -21068,5 +21152,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr "piste_beginner"
@@ -21089,4 +21173,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -21097,4 +21188,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -21171,10 +21270,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr "kracht"
@@ -21188,5 +21288,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr "pijler"
@@ -21200,5 +21300,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr "pijplijn"
@@ -21326,12 +21426,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr "vrije tijd"
@@ -21345,5 +21445,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr "jachthaven"
@@ -21415,8 +21515,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr "voorziening"
@@ -21518,10 +21618,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr "voorziening_verkeer"
@@ -21541,4 +21641,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21560,4 +21667,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21881,4 +21995,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -21905,24 +22027,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr "voorziening_licht"
@@ -21954,6 +22084,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr "licht_water"
@@ -22014,8 +22144,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr "gezondheid"
@@ -22368,26 +22498,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr "winkel"
@@ -22442,5 +22572,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22459,8 +22589,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr "hotel"
@@ -22610,9 +22740,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr "toerisme"
@@ -22684,8 +22814,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr "historisch"
@@ -22756,8 +22886,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr "groen"
@@ -22771,5 +22901,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr "mijnbouw"
@@ -22783,5 +22913,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr "vuilstortplaats"
@@ -22803,5 +22933,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr "estuarium"
@@ -22815,5 +22945,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr "bosbouw"
@@ -22827,5 +22957,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr "landbouwgrond"
@@ -22848,5 +22978,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr "winkelcentrum"
@@ -22860,5 +22990,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr "industrieel"
@@ -22872,5 +23002,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr "braakliggend gebied"
@@ -22884,5 +23014,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr "ontwikkelingsgebied"
@@ -22896,5 +23026,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr "Rangeerterrein"
@@ -22951,7 +23081,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr "militair gebruik"
@@ -22965,5 +23095,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr "begraafplaats"
@@ -22976,5 +23106,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr "berg of -heuveltop"
@@ -22989,5 +23119,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr "gletsjer"
@@ -23001,5 +23131,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr "vulkaan"
@@ -23054,8 +23184,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr "Natuurlijk"
@@ -23069,5 +23199,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr "ruig land"
@@ -23081,5 +23211,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr "heide"
@@ -23093,5 +23223,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr "oerbos"
@@ -23105,5 +23235,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr "slikgronden"
@@ -23117,5 +23247,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr "strand"
@@ -23193,8 +23323,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr "route"
@@ -23242,7 +23372,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr "grens"
@@ -23384,10 +23514,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr "plaats"
@@ -23435,6 +23565,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr "adres"
@@ -23731,36 +23861,24 @@
 msgstr ""
 
-#~ msgid "Unknown file extension."
-#~ msgstr "Onbekende bestandsextentie."
+#~ msgid "Not implemented yet."
+#~ msgstr "Nog niet geïmplementeerd."
+
+#~ msgid "position"
+#~ msgstr "positie"
+
+#~ msgid "Aborting..."
+#~ msgstr "Afbreken..."
+
+#~ msgid "different"
+#~ msgstr "verschillend"
+
+#~ msgid "true"
+#~ msgstr "Waar"
+
+#~ msgid "Change"
+#~ msgstr "Aanpassen"
 
 #~ msgid "Move"
 #~ msgstr "Verplaatsen"
-
-#~ msgid "Invalid projection"
-#~ msgstr "Onjuiste projectie"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Verander eerste de projectie in {0}."
-
-#~ msgid "end"
-#~ msgstr "einde"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Nog niet geïmplementeerd."
-
-#~ msgid "position"
-#~ msgstr "positie"
-
-#~ msgid "Aborting..."
-#~ msgstr "Afbreken..."
-
-#~ msgid "different"
-#~ msgstr "verschillend"
-
-#~ msgid "true"
-#~ msgstr "Waar"
-
-#~ msgid "Change"
-#~ msgstr "Aanpassen"
 
 #~ msgid "Resolve Conflicts"
@@ -23845,7 +23963,4 @@
 #~ msgstr[0] "{0} plugin bijgewerkt. Herstart JOSM a.u.b."
 #~ msgstr[1] "{0} plugins bijgewerkt. Herstart JOSM a.u.b."
-
-#~ msgid "Rotate"
-#~ msgstr "Roteren"
 
 #~ msgid "Could not download plugin: {0} from {1}"
@@ -23976,4 +24091,7 @@
 #~ msgstr "Navigatie"
 
+#~ msgid "end"
+#~ msgstr "einde"
+
 #~ msgid "Really mark this issue as ''done''?"
 #~ msgstr "Dit onderwerp zeker als ''uitgevoerd'' markeren?"
@@ -24040,4 +24158,7 @@
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Los {0} conflicten in {1} objecten op"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Onbekende bestandsextentie."
 
 #~ msgid "Email"
@@ -24149,4 +24270,10 @@
 #~ "doorgaan?"
 
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Verander eerste de projectie in {0}."
+
+#~ msgid "Invalid projection"
+#~ msgstr "Onjuiste projectie"
+
 #~ msgid ""
 #~ "An error occured while trying to match the photos to the GPX track. You "
Index: /applications/editors/josm/i18n/po/pl.po
===================================================================
--- /applications/editors/josm/i18n/po/pl.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/pl.po	(revision 17069)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
-"PO-Revision-Date: 2009-08-07 13:28+0000\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
+"PO-Revision-Date: 2009-08-10 13:27+0000\n"
 "Last-Translator: Łukasz Jernaś <deejay1@srem.org>\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: 2009-08-10 11:56+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
@@ -60,6 +60,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -69,5 +69,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -104,6 +104,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "Błąd"
@@ -115,5 +115,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "Niezapisane zmiany"
@@ -133,10 +133,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -153,15 +153,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -191,6 +191,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -220,5 +220,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -376,5 +376,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
 msgstr ""
@@ -458,9 +458,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -493,7 +493,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -576,37 +576,37 @@
 msgstr "{0} węzłów w drodze {1} przekracza dopuszczalną liczbę węzłów {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "dane"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "warstwa"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "zaznaczenie"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "pobrany obszar"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Pokaż {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Powiększ aby pokazać: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -616,30 +616,30 @@
 msgstr "Widok: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "Brak zaznaczenia, które można pokazać"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "Brak konfliktów, które można pokazać"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "Połącz drogi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "Łączy kilka dróg w jedną."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "Wybierz co najmniej dwie drogi do połączenia."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr "Czy połączyć drogi, które należą do różnych relacji?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -647,13 +647,13 @@
 msgstr "Wybrane drogi należą do różnych relacji. Czy nadal chcesz je połączyć?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "Połącz mimo tego"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "Zmienić kierunek?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -663,10 +663,10 @@
 "zmienić kierunek niektórych dróg?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "Odwróć i połącz"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -674,20 +674,20 @@
 msgstr "Podaj wartości dla wszystkich konfliktów."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Rozwiąż konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Połącz {0} dróg"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "Wszystkie trasy są puste"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -736,6 +736,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -757,6 +757,6 @@
 msgstr "Usuwa wybrane obiekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -766,5 +766,5 @@
 msgstr "Zastąp"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -898,7 +898,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "Eksportuj dane do pliku GPX"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -914,5 +913,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -930,5 +929,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -1002,22 +1001,22 @@
 msgstr "Włącz  aktualną warstwę do innej."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "Połącz węzły"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "Scala wybrane węzły z najstarszym."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "Proszę wybierz przynajmniej dwa węzły aby scalić."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr "Czy scalić węzły z różnych relacji?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1025,9 +1024,9 @@
 msgstr "Wybrane węzły są częścią różnych relacji. Czy nadal chcesz je scalić."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "Scal mimo tego"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -1035,5 +1034,5 @@
 "używana."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1290,7 +1289,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "Żaden dokument nie jest otwarty więc nie ma nic do zapisania."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1884,5 +1882,5 @@
 msgstr "Błędy podczas pobierania"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1894,5 +1892,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr ""
@@ -1931,11 +1929,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2073,5 +2071,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2150,5 +2148,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Szukaj obiektów"
@@ -2274,5 +2272,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Szukaj"
@@ -2471,5 +2469,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2510,5 +2508,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr "Usuń z relacji"
@@ -2548,10 +2546,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "Scal {0} węzłów"
-msgstr[1] "Scal {0} węzłów"
-msgstr[2] "Scal {0} węzłów"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2587,10 +2584,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "{0} węzeł"
-msgstr[1] "{0} węzły"
-msgstr[2] "{0} węzłów"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2754,7 +2750,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "Zmień {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2764,5 +2760,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2811,5 +2807,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2843,5 +2839,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2856,5 +2852,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "tory kolejowe"
@@ -2869,5 +2865,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3147,5 +3143,5 @@
 msgstr "Nie pokazuj ponownie"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3154,5 +3150,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3162,10 +3158,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3173,25 +3169,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "nieznany"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3201,9 +3197,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3212,9 +3208,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "Nieoczekiwany błąd"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3224,9 +3232,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "Nieznany adres"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3236,5 +3244,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr ""
@@ -3318,10 +3326,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "Hasło"
@@ -3523,15 +3531,15 @@
 msgstr "(brak obiektu)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "warstwa nie jest na liście."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3585,5 +3593,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr ""
@@ -3592,5 +3600,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr ""
@@ -3599,20 +3607,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3622,6 +3630,6 @@
 msgstr "Etykiety"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3629,6 +3637,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3636,40 +3644,40 @@
 msgstr "Członkowie"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3677,74 +3685,74 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3752,30 +3760,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3783,5 +3791,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3789,13 +3797,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3803,5 +3811,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3809,21 +3817,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3832,27 +3840,27 @@
 msgstr "Usuń"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3860,5 +3868,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3867,5 +3875,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3874,5 +3882,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3881,5 +3889,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -3888,21 +3896,21 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -3912,5 +3920,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -3920,5 +3928,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -3926,19 +3934,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -3947,19 +3955,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -3968,9 +3976,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -3980,13 +3988,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -3994,90 +4002,90 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "usunięto"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4087,17 +4095,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4106,14 +4114,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4121,21 +4129,21 @@
 msgstr "Rola"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4143,14 +4151,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4158,7 +4166,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4170,7 +4178,7 @@
 msgstr "Klucz"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4183,45 +4191,45 @@
 msgstr "Wartość"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr ""
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4241,8 +4249,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4279,5 +4287,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4379,83 +4387,83 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "Warstwy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "Otwiera listę wszystkich wczytanych warstw."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "Usuń zaznaczoną warstwę."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr "Usuń warstwę"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "Pokaż/Ukryj"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "Zmienia widocznoś zaznaczonej warstwy."
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "Przesuwa wybraną warstwę o jeden wiersz do góry."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "Przesuwa wybraną warstwę o jedno odczo do dołu."
@@ -4465,6 +4473,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4474,22 +4482,22 @@
 msgstr[2] "Ta operacja może zmienić {0} obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "Ustawienie wartości na pustą usuwa klucz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<różne>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "Zmienić wartości?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4497,5 +4505,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4505,40 +4513,40 @@
 msgstr[2] "Zmiana właściwości {0} obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "Proszę wybierz klucz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "Proszę wybierz wartość"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 msgid "Please select the objects you want to change properties for."
 msgstr "Zaznacz proszę te obiekty, których właściwości chcesz zmienić."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "Właściwości/członkostwo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "Właściwości zaznaczonych obiektów."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "Członek"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "Dodaj właściwości"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4555,39 +4563,39 @@
 msgstr "Dodaj"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 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/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "Edycja właściwości"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 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/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Właściwości: {0} / członkostwo: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "Właściwości / członkostwo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "Zmień relację"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Na pewno usunąć zaznaczenie z relacji {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "Usuń wybrany klucz ze wszystkich obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "Usuń właściwość"
@@ -4599,5 +4607,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "Relacje"
@@ -4629,31 +4637,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "Bieżące zaznaczenie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "Otwiera okno z listą zaznaczonych obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "Powiększ do wybranych elementów"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "Odśwież listę zaznaczonych obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "Powiększ do zaznaczenia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Zazn.: Rel.:{0} / Drogi:{1} / Węzły:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4661,5 +4669,5 @@
 msgstr "Zaznaczenie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4669,5 +4677,5 @@
 msgstr[2] "{0} dróg"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4677,5 +4685,5 @@
 msgstr[2] "{0} relacji"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -4886,7 +4894,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "Usuwa zaznaczoną relację."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -4969,5 +4976,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5209,5 +5216,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "Miejsca"
@@ -5254,21 +5261,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "rodzaj"
@@ -6068,72 +6075,517 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "Nazwa"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr "Obrazy dla {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr "Wczytaj GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Brak znacznika czasowego dla punktu {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Nie można odczytać czasu \"{0}\" w punkcie {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr "Nie można znaleźć obrazów z czytelnym znacznikiem czasowym"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "Wczytywanie {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr "Geolokalizowane obrazy"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS początek: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS koniec: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr "aktualne przesunięcie: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr "różnica stref czasowych: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "obraz"
+msgstr[1] "obrazy"
+msgstr[2] "obrazów"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} wewnątrz ścieżki GPS."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "Synchronizuj zegar"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "Pliki JPEG (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Data zawarta w pliku \"{0}\" nie mogła zostać przetworzona."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Plik {0} nie zawiera żadnych danych EXIF o czasie."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "Obraz"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Wpisz pokazaną datę (mm/dd/yyyy HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr "Strefa czasowa urządzenia GPS (różnica do zdjęcia)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr "Synchronizuj czas z urządzeniem GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr "Podany czas nie został rozpoznany."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr "punkt GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "Dostosuj rysowanie linii"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr "Użyj ustawień globalnych."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr "Rysuj linie pomiędzy punktami na tej warstwie."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr "Nie rysuj linii pomiędzy punktami na tej warstwie."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr "Wybierz opcje rysowania linii"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "Dostosuj kolor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Domyślny"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Wybierz kolor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr "Znaczniki nazwanych punktów"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Nazwane punkty GPS z {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "Importuj dźwięk"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr "Pliki audio Wave (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Markery audio z {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "Importuj obrazki"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} ślad, "
+msgstr[1] "{0} ślady, "
+msgstr[2] "{0} śladów, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} trasa, "
+msgstr[1] "{0} trasy, "
+msgstr[2] "{0} tras, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} punkt"
+msgstr[1] "{0} punkty"
+msgstr[2] "{0} punktów"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr "Nazwa: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr "Opis: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr "Okres czasu: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr "Długość: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "Przekształć w warstwę danych"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+msgid ""
+"<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 "
+"za niebezpieczne.<br>Jeśli chcesz wysłać same ślady zajrzyj tu:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Przekonwertowany z: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr "Pobierz dane OSM wzdłuż tej ścieżki"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr "Pobierz wszystko pomiędzy:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr "{0} metrów"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr "Maksymalny obszar na zapytanie:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km kw."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Ta akcja będzie wymagała {0} osobnych pobrań.<br>Czy kontynuować?</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr ""
+"Nie można znaleźć żadnej ścieżki GPX, którą by można zsynchronizować z "
+"danymi dźwiękowymi."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Warstwa danych {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr "poza pobranym obszarem"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "Obiekty na warstwie {0}:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} usuniętych.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6142,7 +6594,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6152,450 +6604,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "Nazwa"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr "Obrazy dla {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr "Wczytaj GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Brak znacznika czasowego dla punktu {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Nie można odczytać czasu \"{0}\" w punkcie {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr "Nie można znaleźć obrazów z czytelnym znacznikiem czasowym"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Wczytywanie {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr "Geolokalizowane obrazy"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS początek: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS koniec: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr "aktualne przesunięcie: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr "różnica stref czasowych: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "obraz"
-msgstr[1] "obrazy"
-msgstr[2] "obrazów"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} wewnątrz ścieżki GPS."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "Synchronizuj zegar"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "Pliki JPEG (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Data zawarta w pliku \"{0}\" nie mogła zostać przetworzona."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Plik {0} nie zawiera żadnych danych EXIF o czasie."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "Obraz"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Wpisz pokazaną datę (mm/dd/yyyy HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr "Strefa czasowa urządzenia GPS (różnica do zdjęcia)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr "Synchronizuj czas z urządzeniem GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr "Podany czas nie został rozpoznany."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr "punkt GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "Dostosuj rysowanie linii"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "Użyj ustawień globalnych."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr "Rysuj linie pomiędzy punktami na tej warstwie."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr "Nie rysuj linii pomiędzy punktami na tej warstwie."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr "Wybierz opcje rysowania linii"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "Dostosuj kolor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Domyślny"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Wybierz kolor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr "Znaczniki nazwanych punktów"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Nazwane punkty GPS z {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "Importuj dźwięk"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr "Pliki audio Wave (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Markery audio z {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "Importuj obrazki"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} ślad, "
-msgstr[1] "{0} ślady, "
-msgstr[2] "{0} śladów, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} trasa, "
-msgstr[1] "{0} trasy, "
-msgstr[2] "{0} tras, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} punkt"
-msgstr[1] "{0} punkty"
-msgstr[2] "{0} punktów"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr "Nazwa: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr "Opis: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr "Okres czasu: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr "Długość: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "Przekształć w warstwę danych"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-msgid ""
-"<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 "
-"za niebezpieczne.<br>Jeśli chcesz wysłać same ślady zajrzyj tu:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Przekonwertowany z: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr "Pobierz dane OSM wzdłuż tej ścieżki"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr "Pobierz wszystko pomiędzy:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr "{0} metrów"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr "Maksymalny obszar na zapytanie:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km kw."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Ta akcja będzie wymagała {0} osobnych pobrań.<br>Czy kontynuować?</"
-"html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr ""
-"Nie można znaleźć żadnej ścieżki GPX, którą by można zsynchronizować z "
-"danymi dźwiękowymi."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Warstwa danych {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr "poza pobranym obszarem"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "Obiekty na warstwie {0}:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} usuniętych.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -6974,5 +6981,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "Samochód"
@@ -6989,16 +6996,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "Rowery"
@@ -7026,14 +7035,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "Ruch pieszy"
@@ -7248,19 +7260,19 @@
 msgstr "Język"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr ""
@@ -7390,35 +7402,11 @@
 msgstr "Proxy - hasło"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Adres URL serwera OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr "Hasło konta OSM. Pozostaw puste aby nie zapamiętywać hasła."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "Adres URL serwera"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "Hasło OSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -7769,7 +7757,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "Nie można odczytać \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -7874,7 +7862,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "Nieznana rola \"{0}\"."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8032,23 +8020,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "Nieprawidłowe hasło lub nazwa użytkownika."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Uwaga: Hasło nie jest szyfrowane podczas transmisji."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "Zapisz nazwę użytkownika i hasło (nieszyfrowane)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "Wprowadź hasło"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
 msgstr "Logowanie"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr "Hasło konta OSM. Pozostaw puste aby nie zapamiętywać hasła."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "Hasło OSM"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -8211,14 +8223,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "Nieznany typ: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "Przygotowywanie danych OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr "Zły format identyfikatora węzła"
@@ -8677,5 +8689,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr "Opis"
@@ -9082,5 +9094,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr "Błąd podczas ładowania pliku"
@@ -9408,5 +9420,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -9942,7 +9954,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr "woda"
@@ -10115,7 +10127,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "nazwa"
+msgstr ""
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10671,12 +10682,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "początek"
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0} węzeł"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -10814,5 +10825,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr "Nazwa ulicy"
@@ -11626,7 +11637,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr "budynek"
@@ -11640,5 +11651,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr "obszar"
@@ -11871,12 +11882,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "Proszę wybrać wiersz do edycji"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "Usuń warstwę"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
@@ -11889,7 +11898,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "Brak zmian do wysłania."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -11902,61 +11910,61 @@
 "Może to spowodować powstanie błędnych współrzędnych."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr "Zmiana rozdzielczości"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr "Błędny format pliku"
@@ -12284,4 +12292,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12318,5 +12328,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr "Sieć drogowa"
@@ -12327,5 +12337,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "autostrada"
@@ -12334,5 +12344,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr "Edycja autostrady"
@@ -12359,8 +12369,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr "Numer"
@@ -12401,21 +12411,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr "Warstwa"
@@ -12429,8 +12439,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr "Liczba pasów ruchu"
@@ -12448,15 +12458,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr "Max. prędkość (km/h)"
@@ -12493,16 +12503,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr "jednokierunkowa"
@@ -12544,19 +12554,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "most"
@@ -12592,19 +12602,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr "tunel"
@@ -12638,18 +12648,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr "wykop"
@@ -12683,18 +12693,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr "nasyp"
@@ -12702,5 +12712,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr "autostrada - dojazd"
@@ -12709,5 +12719,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr "Edycja dojazdu do autostrady"
@@ -12715,5 +12725,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr "droga ekspresowa"
@@ -12722,5 +12732,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr "Edycja drogi ekspresowej"
@@ -12730,6 +12740,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr ""
@@ -12737,5 +12747,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr "droga ekspresowa - dojazd"
@@ -12744,5 +12754,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr "Edycja dojazdu do drogi ekspresowej"
@@ -12755,5 +12765,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "droga krajowa"
@@ -12762,5 +12772,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr "Edycja drogi krajowej"
@@ -12768,10 +12778,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr "droga krajowa - dojazd"
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr "Edycja dojazdu do drogi krajowej"
@@ -12783,5 +12793,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "droga wojewódzka"
@@ -12791,5 +12801,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr "Edycja drogi wojewódzkiej"
@@ -12797,5 +12807,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr "droga powiatowa"
@@ -12805,5 +12815,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr "Edycja drogi powiatowej"
@@ -12815,5 +12825,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "droga gminna"
@@ -12823,5 +12833,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr "Edycja drogi gminnej lub innej drogi publicznej"
@@ -12848,19 +12858,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr "Szerokość (w metrach)"
@@ -12872,5 +12882,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "droga lokalna"
@@ -12879,5 +12889,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr "Edycja drogi lokalnej / ulicy"
@@ -12901,13 +12911,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr "Nawierzchnia"
@@ -12927,20 +12937,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr ""
@@ -12948,12 +12958,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr "bruk"
@@ -12961,5 +12971,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr "strefa zamieszkania"
@@ -12968,5 +12978,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr "Edycja strefy zamieszkania"
@@ -12974,5 +12984,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr "droga serwisowa"
@@ -12981,5 +12991,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr "Edycja drogi serwisowej"
@@ -12989,18 +12999,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr "Alejka"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr "podjazd"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr "wysepka parkignowa"
@@ -13008,5 +13018,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr "uliczka parkingowa"
@@ -13016,5 +13026,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr "Edycja uliczki parkingowej"
@@ -13022,5 +13032,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr "droga (nieokreślona)"
@@ -13029,5 +13039,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr "Edycja drogi nieokreślonego rodzaju"
@@ -13036,20 +13046,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr "ograniczenia na drodze"
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr "Edycja ograniczeń na drodze"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr "bramka (opłata)"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr "ślepa ulica"
@@ -13062,8 +13072,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr "Dostęp do drogi"
@@ -13107,23 +13117,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr "tak"
@@ -13136,40 +13146,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr "droga prywatna"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr "dla wyznaczonych pojazdów"
@@ -13182,19 +13192,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr "dojazd do posesji"
@@ -13217,65 +13227,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr "dopuszczalny"
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr "dla rolnictwa"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr "nie"
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr "Zaopatrzenie"
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Samochody dostawcze"
@@ -13290,10 +13300,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr "Konie"
@@ -13309,13 +13319,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr "Motocykle"
@@ -13331,30 +13341,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr "Samochody"
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr "Transport publiczny"
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr "Motorówka"
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr "Łódka"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr "Min. prędkość (km/h)"
@@ -13362,25 +13372,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr "Max. ciężar (w tonach)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr "Maks. wysokość (w metrach)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr "Maks. szerokość (w metrach)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr "Maks. długość (w metrach)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr "rondo"
@@ -13391,5 +13401,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr "Edycja skrzyżowania"
@@ -13411,9 +13421,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr "Rodzaj"
@@ -13433,10 +13443,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr "autostrada"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr "ciąg pieszy"
@@ -13458,10 +13468,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr "droga ekspresowa"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr "droga ekspresowa - dojazd"
@@ -13483,10 +13493,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr "droga krajowa"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr "droga krajowa - dojazd"
@@ -13508,6 +13518,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr "droga wojewódzka"
@@ -13521,9 +13531,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr "droga powiatowa"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr "droga gminna"
@@ -13537,9 +13547,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr "droga lokalna"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr "strefa zamieszkania"
@@ -13569,10 +13579,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr "droga serwisowa"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr "wydzielony pas autobusowy"
@@ -13580,4 +13590,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13595,6 +13612,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr "w budowie"
@@ -13605,10 +13622,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr "Edycja mostu"
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr "Edycja tunelu"
@@ -13616,19 +13633,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr "Drogi"
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr "w budowie"
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr "Edycja drogi w budowie"
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr "Skrzyżowanie"
@@ -13644,5 +13661,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr "rondo"
@@ -13651,5 +13668,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr "ścieżka do jazdy konnej"
@@ -13657,5 +13674,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr "Edycja ścieżki do jazdy konnej"
@@ -13663,5 +13680,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr "ścieżka rowerowa"
@@ -13671,5 +13688,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr "Edycja ścieżki rowerowej"
@@ -13677,5 +13694,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr "droga dla pieszych"
@@ -13684,5 +13701,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr "Edycja drogi dla pieszych"
@@ -13690,5 +13707,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr "ciąg pieszy"
@@ -13697,5 +13714,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr "Edycja ciągu pieszego"
@@ -13703,5 +13720,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr "schody"
@@ -13711,5 +13728,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr "Edycja schodów"
@@ -13718,5 +13735,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr "droga gruntowa"
@@ -13725,14 +13742,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr "Edycja drogi gruntowej"
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr "żwir"
@@ -13740,18 +13757,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr "grunt"
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr "trawa"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr "piach"
@@ -13759,5 +13776,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr "droga gruntowa klasy 1"
@@ -13766,5 +13783,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr "Edycja drogi gruntowej klasy 1"
@@ -13772,5 +13789,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr "droga gruntowa klasy 2"
@@ -13779,5 +13796,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr "Edycja drogi gruntowej klasy 2"
@@ -13785,5 +13802,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr "droga gruntowa klasy 3"
@@ -13792,5 +13809,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr "Edycja drogi gruntowej klasy 3"
@@ -13798,5 +13815,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr "droga gruntowa klasy 4"
@@ -13805,5 +13822,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr "Edycja drogi gruntowej klasy 4"
@@ -13811,5 +13828,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr "droga gruntowa klasy 5"
@@ -13818,5 +13835,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr "Edycja drogi gruntowej klasy 5"
@@ -13825,5 +13842,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr "ścieżka"
@@ -13832,13 +13849,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr "Edycja ścieżki"
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr "Skuter śnieżny"
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr "Narty"
@@ -13846,5 +13863,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr "szlak"
@@ -13854,5 +13871,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr "Edycja szlaku"
@@ -13860,5 +13877,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr "szlak górski"
@@ -13868,5 +13885,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr "Edycja szlaku górskiego"
@@ -13874,5 +13891,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr "stromy szlak górski"
@@ -13882,5 +13899,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr "miejsce do zawracania"
@@ -13888,5 +13905,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr "szlak alpejski"
@@ -13896,5 +13913,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr "Edycja szlaku alpejskiego"
@@ -13902,5 +13919,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr "stromy szlak alpejski"
@@ -13910,5 +13927,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Edycja stromego szlaku alpejskiego"
@@ -13916,5 +13933,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr "trudny szlak alpejski"
@@ -13924,5 +13941,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Edycja trudnego szlaku alpejskiego"
@@ -13930,10 +13947,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr "Punkty drogowe"
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr "skrzyżowanie autostrad"
@@ -13941,15 +13958,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr "Edycja skrzyżowania autostrad"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr "Numer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr "miejsce obsługi podróżnych"
@@ -13957,5 +13974,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr "Edycja miejsca obsługi podróżnych"
@@ -13990,14 +14007,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr "Operator"
@@ -14006,5 +14023,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr "sygnalizacja świetlna"
@@ -14014,5 +14031,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr "Typ przejścia dla pieszych"
@@ -14021,27 +14038,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr "sygnalizacja świetlna"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr "wysepka"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr "nieoznakowane"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr ""
@@ -14049,6 +14066,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr ""
@@ -14057,11 +14074,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -14069,30 +14086,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr "znak stop"
@@ -14100,5 +14117,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -14107,14 +14124,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr "Miniaturowe rondo"
@@ -14125,14 +14142,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr "Kierunek"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr "zgodnie z ruchem wskazówek zegara"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr "miejsce do zawracania"
@@ -14142,20 +14159,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr "granica miasta"
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr "Edycja tablicy oznaczającej granicę miasta"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr "Druga nazwa"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr "fotoradar"
@@ -14163,5 +14180,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr "Telefon alarmowy"
@@ -14169,5 +14186,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr ""
@@ -14175,5 +14192,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr ""
@@ -14182,10 +14199,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr "bród"
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr "Edycja brodu"
@@ -14193,5 +14210,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr "przełęcz"
@@ -14199,5 +14216,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr "Edycja przełęczy"
@@ -14209,7 +14226,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr "Wysokość"
@@ -14217,5 +14234,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr "Przeszkody"
@@ -14223,5 +14240,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr "słupek drogowy"
@@ -14229,5 +14246,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr "Edycja słupka drogowego"
@@ -14266,18 +14283,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr ""
@@ -14286,5 +14307,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr ""
@@ -14292,5 +14313,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr "przeszkoda dla bydła"
@@ -14298,10 +14319,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr "Edycja przeszkody dla bydła"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr ""
@@ -14309,15 +14330,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr "Kolczatka"
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr "Edycja kolczatki"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr "punkt poboru opłat"
@@ -14325,5 +14346,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr "Edycja punktu poboru opłat"
@@ -14331,10 +14352,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr "przejście graniczne"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr "Edycja przejścia granicznego"
@@ -14344,5 +14365,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr "żywopłot"
@@ -14351,5 +14372,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr "ogrodzenie"
@@ -14358,5 +14379,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr "mur"
@@ -14364,5 +14385,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr "mury miejskie"
@@ -14371,5 +14392,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr "mur oporowy"
@@ -14381,15 +14402,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr "Wejście"
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr "Edycja wejścia"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr "brama"
@@ -14397,50 +14418,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr "Edycja bramy"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr "przełaz"
@@ -14448,15 +14469,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr "Edycja przełazu"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+#, fuzzy
+msgid "Turnstile"
+msgstr "obrotnica"
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "Edycja przełazu"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr ""
@@ -14467,10 +14500,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr "zbiornik wodny"
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr "źródło"
@@ -14478,5 +14511,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr "plaża"
@@ -14484,5 +14517,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr "odpływ"
@@ -14490,10 +14523,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr "Edycja odpływu"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr "strumień"
@@ -14501,10 +14534,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr "Edycja strumienia"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr "kanał"
@@ -14512,10 +14545,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr "Edycja kanału"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr "rzeka"
@@ -14525,5 +14558,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr "Edycja rzeki"
@@ -14531,15 +14564,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr "Edycja zbiornika wodnego"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr "ląd"
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr "Edycja lądu"
@@ -14547,15 +14580,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr "zbiornik wodny"
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr "Edycja zbiornika wodnego"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr "sztuczne jezioro"
@@ -14563,15 +14596,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr "Edycja sztucznego jeziora"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -14579,5 +14612,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr ""
@@ -14586,10 +14619,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr "mokradło"
@@ -14600,14 +14633,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr "Edycja mokradła"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr "bagno"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr "torfowisko"
@@ -14621,35 +14654,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr "marsze"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr "szuwary"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr "tereny zalewowe"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr "namorzyny"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr "błota"
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr "Edycja błot"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr "plaża"
@@ -14657,20 +14690,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr "Edycja plaży"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr "zatoka"
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr "Edycja zatoki"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr "klif"
@@ -14678,10 +14711,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr "Edycja klifu"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr "wybrzeże"
@@ -14689,5 +14722,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr "Edycja zbiornika gazu"
@@ -14695,5 +14728,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr "trasa promu"
@@ -14701,5 +14734,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr "Edycja trasy promu"
@@ -14708,5 +14741,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr "stocznia"
@@ -14714,10 +14747,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr "Edycja stoczni"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr "dok"
@@ -14725,5 +14758,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr "Edycja doku"
@@ -14731,5 +14764,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr "Tama"
@@ -14737,15 +14770,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr "Edycja tamy"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr "Punkty drogi wodnej"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr "wrota śluzy"
@@ -14754,5 +14787,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr "jaz"
@@ -14760,20 +14793,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr "Edycja jazu"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr "wodospad"
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr "Edycja wodospadu"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr ""
@@ -14782,15 +14815,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr "marina"
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr "Edycja mariny"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr "molo"
@@ -14798,10 +14831,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr "Edycja molo"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr "terminal promowy"
@@ -14809,10 +14842,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr "Edycja terminalu promowego"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr "pochylnia"
@@ -14822,5 +14855,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr "Edycja pochylni"
@@ -14828,10 +14861,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr "Kolej"
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr "tor"
@@ -14839,5 +14872,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr "Edycja toru"
@@ -14867,8 +14900,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr "Rodzaj (opcjonalne)"
@@ -14882,35 +14915,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr "dworzec przetokowy"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr "bocznica"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr "odnoga"
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr "kolej wąskotorowa"
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr "Edycja toru kolei wąskotorowej"
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr "tor jednoszynowy"
@@ -14918,45 +14951,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr "Edycja toru jednoszynowego"
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr "kolej retro"
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr "Edycja kolei retro"
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr "trasa szybkiego tramwaju"
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr "Edycja trasy szybkiego tramwaju"
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr "metro"
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr "Edycja toru metra"
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr "tramwaj"
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr "Edycja torów tramwajowych"
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr ""
@@ -14964,5 +14997,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -14971,14 +15004,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr "nieużywany tor"
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr "Edycja opuszczonych torów"
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr "nieczynny tor"
@@ -14987,5 +15020,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr "przejazd kolejowy"
@@ -14994,5 +15027,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr "przejazd przez tory"
@@ -15002,5 +15035,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr "Rodzaj przejazdu"
@@ -15008,5 +15041,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr "obrotnica"
@@ -15015,10 +15048,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr "Koleje linowe"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr "wyciąg krzesełkowy"
@@ -15026,10 +15059,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr "Edycja wyciągu krzesełkowego"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr "wyciąg orczykowy"
@@ -15037,10 +15070,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr "Edycja wyciągu orczykowego"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr "kolej linowa"
@@ -15048,10 +15081,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr "Edycja kolei linowej"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr ""
@@ -15059,5 +15092,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr ""
@@ -15065,5 +15098,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr "stacja"
@@ -15074,10 +15107,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr "Edycja stacji"
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr "stacja benzynowa"
@@ -15087,5 +15120,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr "Edycja stacji benzynowej"
@@ -15101,5 +15134,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15109,5 +15142,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr "Edycja parkingu"
@@ -15115,41 +15148,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr "Pojemność"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr "powierzchnia"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr "wielopoziomowy"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr "podziemny"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr "parkuj i jedź"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr "Miejsca dla niepełnosprawnych"
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr "Opłata"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr "Myjnia samochodowa"
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr "Edycja myjni samochodowej"
@@ -15157,5 +15190,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr "warsztat"
@@ -15163,15 +15196,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr "Edycja warsztatu samochodowego"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr ""
@@ -15179,5 +15212,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr "wypożyczalnia"
@@ -15186,10 +15219,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr "Edycja wypożyczalni samochodów"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr ""
@@ -15197,5 +15230,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr ""
@@ -15203,5 +15236,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr "Edycja parkingu dla rowerów"
@@ -15210,5 +15243,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr "Edycja wypożyczalni rowerów"
@@ -15217,15 +15250,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr "Edycja warsztatu rowerowego"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "Transport publiczny"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr ""
@@ -15233,5 +15266,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr "przystanek kolejowy"
@@ -15239,5 +15272,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr "Edycja przystanku kolejowego"
@@ -15245,5 +15278,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr "przystanek tramwajowy"
@@ -15252,5 +15285,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr "Edycja przystanku tramwajowego"
@@ -15258,5 +15291,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr "Platforma kolejowa"
@@ -15265,5 +15298,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr "Edytuj platformę kolejową"
@@ -15275,5 +15308,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr "Oznaczenie (numer toru)"
@@ -15281,10 +15314,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr "obszar"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr "wejście do metra"
@@ -15293,10 +15326,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr "Edycja wejścia do metra"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr "dla niepełnosprawnych"
@@ -15305,5 +15338,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr "dworzec autobusowy"
@@ -15312,5 +15345,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr "Edycja dworca autobusowego"
@@ -15318,5 +15351,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr "Przystanek autobusowy"
@@ -15326,5 +15359,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr "Edycja przystanku autobusowego"
@@ -15335,6 +15368,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr "schronienie"
@@ -15342,10 +15375,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr ""
@@ -15353,5 +15386,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr "taksówki"
@@ -15359,5 +15392,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr "Edycja postoju taksówek"
@@ -15365,5 +15398,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr "lotnisko"
@@ -15371,15 +15404,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr "Edycja lotniska"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr "ICAO"
@@ -15388,5 +15421,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr "Zakwaterowanie"
@@ -15398,5 +15431,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "hotel"
@@ -15405,15 +15438,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr "Edycja hotelu"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr "Gwiazdki"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr "motel"
@@ -15421,20 +15454,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr "Edycja motelu"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr "kwatera"
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr "Edycja kwatery turystycznej"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr "chata górska"
@@ -15442,10 +15475,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr "Edycja chaty górskiej"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr "hostel"
@@ -15453,30 +15486,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr "Edycja hostelu"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr "chata alpejska"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr "Edycja chaty alpejskiej"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr "kemping"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr "Edycja kempingu"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr "pole namiotowe"
@@ -15484,10 +15517,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr "Edycja pola namiotowego"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "Wyżywienie"
@@ -15498,5 +15531,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "restauracja"
@@ -15504,5 +15537,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr "Edycja restauracji"
@@ -15510,5 +15543,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr "Kuchnia"
@@ -15516,61 +15549,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr "włoska"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr "chińska"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr "hamburgery"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr "grecka"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr "niemiecka"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr "indyjska"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr "regionalna"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr "turecka"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr "azjatycka"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr "tajska"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr "meksykańska"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr "japońska"
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr "fast food"
@@ -15578,9 +15611,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr "Edycja restauracji fast-food"
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr "kawiarnia"
@@ -15588,10 +15621,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr "Edycja kawiarni"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr "pub"
@@ -15599,20 +15632,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr "Edycja pubu"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr "ogródek piwny"
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr "Edycja ogródka piwnego"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr "bar"
@@ -15620,10 +15653,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr "Edycja baru"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr "klub nocny"
@@ -15631,20 +15664,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr "Edycja klubu nocnego"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "Turystyka"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr "atrakcja"
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr "Edycja atrakcji turystycznej"
@@ -15653,11 +15686,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr "godziny otwarcia"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "muzeum"
@@ -15665,10 +15698,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr "Edycja muzeum"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "zoo"
@@ -15677,10 +15710,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr "Edycja zoo"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr "punkt widokowy"
@@ -15688,25 +15721,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr "Edycja punktu widokowego"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr "wieża widokowa"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr "park rozrywki"
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr "Edycja parku rozrywki"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr "sztuka"
@@ -15714,5 +15747,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr "Edycja obiektu sztuki"
@@ -15720,5 +15753,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr ""
@@ -15726,80 +15759,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr ""
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr ""
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr "mapa"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr "mapa miasta"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr "mapa tras pieszych"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr "mapa tras rowerowych"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
 msgid "Closer Description"
 msgstr ""
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1701
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Board Type"
 msgstr "Rodzaj tablicy"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "board"
 msgstr "tablica informacyjna"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "history"
 msgstr "tablica historyczna"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "nature"
 msgstr "tablica przyrodnicza"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "wildlife"
 msgstr "tablica o zwierzętach"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Guidepost (Hiking)"
 msgstr ""
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr "Edycja schronienia"
@@ -15807,25 +15840,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr "miejsce na ognisko"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr "miejsce na piknik"
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr "Edycja miejsca na piknik"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "Miejsca historyczne"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "zamek"
@@ -15834,20 +15867,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr "Edycja zamku"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "ruiny"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr "Edycja ruin"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr "Wykopaliska archeologiczne"
@@ -15856,10 +15889,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr "Edycja wykopalisk archeologicznych"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr "pole bitwy"
@@ -15867,5 +15900,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr "Edycja pola bitwy"
@@ -15873,15 +15906,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr "pomnik"
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr "Edycja pomnika"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr "miejsce pamięci"
@@ -15889,45 +15922,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr "Edycja miejsca pamięci"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr "krzyż przydrożny"
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr "Edycja krzyża przydrożnego"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr "kapliczka"
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr "Edycja kapliczki"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "Rozrywka"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr "park wodny"
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr "Edycja parku wodnego"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "plac zabaw"
@@ -15935,15 +15968,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr "Edycja placu zabaw"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "miejsce do wędkowania"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr "Edycja miejsca do wędkowania"
@@ -15951,15 +15984,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr "obiekty sportowe"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "stadion"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr "Edycja stadionu"
@@ -15973,6 +16006,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "wybierz sport:"
@@ -15995,4 +16028,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -16053,5 +16094,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16061,5 +16110,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16205,5 +16254,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16309,5 +16358,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16348,29 +16397,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr "sport"
@@ -16380,227 +16430,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr "różne sporty"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr "łucznictwo"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr "lekkoatletyka"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr "siatkówka"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr "bule"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr "gra w kule"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr "kajakarstwo"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr "wspinaczka"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr "krykiet"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr "krokiet"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr "kolarstwo"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr "wyścigi psów"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr "jazda konna"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr "football"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr "gimnastyka"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr "wyścigi konne"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr "sporty motorowe"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr "strzelectwo"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr "jazda na deskorolce"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr "łyżwiarstwo"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr "narciarstwo"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "piłka nożna"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr "pływanie"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "tenis stołowy"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr "centrum sportowe"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr "Edycja centrum sportowego"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr "boisko"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr "Edycja boiska"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr "tor wyścigowy"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr "Edycja toru wyścigowego"
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr "pole golfowe"
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr "Edycja pola golfowego"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr "miniaturowy golf"
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr "Edycja miniaturowego golfa"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr "różne sporty"
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr ""
@@ -16639,191 +16689,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr "boisko"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr "centrum sportowe"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr "kręgle"
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr "Edycja kręgli"
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr "lekkoatletyka"
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr "Edycja"
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr "łucznictwo"
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr "wspinaczka"
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr "kajakarstwo"
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr ""
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr "kolarstwo"
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr "wyścigi psów"
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr "jeździectwo"
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr "wyścigi konne"
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr "gimnastyka"
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr "sporty motorowe"
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr "łyżwiarstwo"
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr "jazda na deskorolce"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr "pływanie"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr ""
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr "narciarstwo"
@@ -16831,56 +16881,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr "Rodzaj trasy"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr "Poziom trudności"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr "dla początkujących"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr "łatwa"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr "dla ekspertów"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr "strzelectwo"
@@ -16888,178 +16938,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr "Sporty z piłką"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr "piłka nożna"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr "football"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr "australijski football"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr "baseball"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr "koszykówka"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr "golf"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr "pole golfowe"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr "bule"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr "Edycja boiska do gry w boule"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr "gra w kule"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr "krykiet"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr "Edycja boiska do gry w krykieta"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr "krykiet - siatki"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr "Edycja siatek do treningu gry w krykieta"
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr "krokiet"
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr "Edycja miejsca do gry w krokieta"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr "hokej"
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr "Edycja miejsca do gry w hokeja"
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr "Edycja miejsca do gry w pelotę"
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr "rugby"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr "Edycja miejsca do gry w rugby"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr "tenis stołowy"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr "Edycja miejsca do gry w tenis stołowy"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr "tenis"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr "Edycja miejsca do gry w tenisa"
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "Budynki"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr "budynek"
@@ -17067,5 +17117,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "budynek użyteczności publicznej"
@@ -17073,10 +17123,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr "Edycja budynku użyteczności publicznej"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "ratusz"
@@ -17084,10 +17134,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "Edycja ratusza"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "ambasada"
@@ -17095,10 +17145,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "Edycja ambasady"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "sąd"
@@ -17107,10 +17157,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "Edycja siedziby sądu"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "więzienie"
@@ -17119,10 +17169,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "Edycja więzienia"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "posterunek policji"
@@ -17132,10 +17182,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "Edycja posterunku policji"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "straż pożarna"
@@ -17144,10 +17194,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "Edycja posterunku straży pożarnej"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "poczta"
@@ -17155,5 +17205,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr "Edycja urzędu pocztowego"
@@ -17161,15 +17211,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr "przedszkole"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr "Edycja przedszkola"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "szkoła"
@@ -17177,10 +17227,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "Edycja szkoły"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr "uniwersytet"
@@ -17188,10 +17238,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr "Edycja uniwersytetu"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr "college"
@@ -17199,5 +17249,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr "Edycja college'u"
@@ -17205,5 +17255,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "kino"
@@ -17212,10 +17262,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "Edycja kina"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "biblioteka"
@@ -17224,10 +17274,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "Edycja biblioteki"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr "centrum kulturalne"
@@ -17235,10 +17285,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr "Edycja centrum kulturalnego"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "teatr"
@@ -17247,10 +17297,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "Edycja teatru"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr "miejsce kultu religijnego"
@@ -17260,5 +17310,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr "Edycja miejsca kultu religijnego"
@@ -17267,6 +17317,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr "Religia"
@@ -17275,66 +17325,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr "bahaizm"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr "buddyzm"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr "chrześcijaństwo"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr "hinduizm"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr "dżinizm"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr "judaizm"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr "islam"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr "sikhizm"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr "spirytualizm"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr "taoizm"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr "zaratusztrianizm"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr "Wyznanie"
@@ -17343,81 +17393,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr "kościół anglikański"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr "baptyści"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr "kościół katolicki"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr "ewangelikalizm"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr "świadkowie Jehowy"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr "luteranie"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr "metodyści"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr "mormoni"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr "kościół prawosławny"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr "zielonoświątkowcy"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr "prezbiterianie"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr "protestanci"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr "kwakrzy"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr "szyici"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr "sunnici"
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr "Adresy"
@@ -17426,5 +17476,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr "Edycja informacji o adresach"
@@ -17432,5 +17482,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr "Numer domu"
@@ -17438,20 +17488,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr "Nazwa domu"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr "Nazwa miejscowości"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "Kod pocztowy"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr "Kod kraju"
@@ -17459,5 +17509,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr "Interpolacja adresów"
@@ -17466,5 +17516,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr "Edycja interpolacji adresów"
@@ -17472,71 +17522,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr "Sposób numeracji domów"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr "parzyste"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr "nieparzyste"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr "wszystkie"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr "Obiekty sztuczne"
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr "zakład produkcyjny"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr "Edycja zakładu produkcyjnego"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "wieża"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "Edycja wieży"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "wieża ciśnień"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "Edycja wieży ciśnień"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr "zbiornik gazu"
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr "Edycja zbiornika gazu"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "latarnia morska"
@@ -17544,10 +17594,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "Edycja latarni morskiej"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "wiatrak"
@@ -17555,10 +17605,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "Edycja wiatraka"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "rurociąg"
@@ -17566,10 +17616,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "Edycja rurociągu"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr "oczyszczalnia ścieków"
@@ -17579,10 +17629,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr "Edycja oczyszczalni ścieków"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr "dźwig"
@@ -17590,10 +17640,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr "Edycja dźwigu"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr "radiolatarnia"
@@ -17601,10 +17651,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr "Edycja radiolatarni"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr "punkt geodezyjny"
@@ -17612,10 +17662,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr "Edycja punktu geodezyjnego"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr "monitoring"
@@ -17623,5 +17673,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr "Edycja kamery do monitoringu"
@@ -17629,5 +17679,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr "źródło energii elektrycznej"
@@ -17637,39 +17687,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr "Edycja źródła energii elektrycznej"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr "wiatrowa"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr "wodna"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr "cieplna"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr "jądrowa"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr "węglowa"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr "fotowoltaiczna"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr "gazowa"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr "elektrownia"
@@ -17678,10 +17728,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr "Edycja elektrowni"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr "rozdzielnia elektryczna"
@@ -17690,5 +17740,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr "Edycja rozdzielni elektrycznej"
@@ -17696,10 +17746,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr "oznaczenie linii"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr "słup elektryczny"
@@ -17710,5 +17760,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr "Edycja słupa linii wysokiego napięcia"
@@ -17716,5 +17766,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr "linia wysokiego napięcia"
@@ -17723,25 +17773,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr "Edycja linii wysokiego napięcia"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr "Napięcie"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr "Ilość przewodów"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "toalety"
@@ -17749,20 +17799,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr "Numer referencyjny"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr "Uwagi"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr "skrzynka pocztowa"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "telefon"
@@ -17771,5 +17821,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr "Edycja telefonu"
@@ -17777,5 +17827,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "na monety"
@@ -17783,5 +17833,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr "na banknoty"
@@ -17789,5 +17839,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr "na karty chipowe"
@@ -17795,5 +17845,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr "na karty debetowe"
@@ -17801,15 +17851,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "na karty kredytowe"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "na karty telefoniczne"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr "zbiórka odpadów"
@@ -17818,5 +17868,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr "Edycja punktu zbiórki odpadów"
@@ -17824,35 +17874,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr "baterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr "puszki"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr "odzież"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr "szkło"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr "papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr "złom"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr "ławka"
@@ -17861,20 +17911,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr "Ambona myśliwska"
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr "Edycja ambony strzelniczej"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr ""
@@ -17882,22 +17932,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr "Wysokość"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr "fontanna"
@@ -17906,10 +17956,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr "Edycja fontanny"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "woda do picia"
@@ -17918,10 +17968,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "Edycja punktu z wodą pitną"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr ""
@@ -17929,25 +17979,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "Sklepy"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr "supermarket"
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr "Edycja supermarketu"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr "sklepik"
@@ -17955,10 +18005,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr "Edycja sklepiku"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr "kiosk"
@@ -17966,10 +18016,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr "Edycja kiosku"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "automat sprzedający"
@@ -17977,5 +18027,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "Edycja automatu sprzedającego"
@@ -17983,88 +18033,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "Sprzedawane produkty"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr "bilety komunikacji miejskiej"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr "mapy komunikacji miejskiej"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr "bilety parkingowe"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr "jedzenie"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "napoje"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr "słodycze"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr "papierosy"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr "zdjęcia"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr "jedzenie dla zwierząt"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "gazety"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "zabawki"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr "znaczki"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "karty SIM"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr "vouchery"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr "prezerwatywy"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr "tampony"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr "torby na odchody"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "rzeźnik"
@@ -18072,10 +18122,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "Edycja sklepu mięsnego"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "piekarnia"
@@ -18083,10 +18133,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "Edycja piekarni"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr "florysta"
@@ -18094,20 +18144,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr "Edycja kwiaciarni"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr "naturalna żywność"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr "Edycja sklepu z naturalną żywnością"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr ""
@@ -18115,60 +18165,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr ""
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr "napoje"
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr ""
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr "komputery"
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr "Edycja sklepu komputerowego"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr "elektronika"
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr "Edycja sklepu z elektroniką"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr "sprzęt hifi"
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr "Edycja sklepu ze sprzętem hi-fi"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr "meble"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr "Edycja sklepu meblowego"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr "centrum ogrodnicze"
@@ -18176,10 +18226,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr "Edycja centrum ogrodniczego"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr ""
@@ -18187,10 +18237,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr "sklep DIY"
@@ -18198,60 +18248,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr "Edycja sklepu DIY (zrób to sam)"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr "artykuły biurowe"
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr "Edycja sklepu z artykułami biurowymi"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr "fryzjer"
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr "Edycja salonu fryzjerskiego"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr "obuwie"
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr "Edycja sklepu obuwniczego"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr "zabawki"
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr "Edycja sklepu z zabawkami"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "pralnia chemiczna"
@@ -18259,10 +18309,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "Edycja palni chemicznej"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "pralnia samoobsługowa"
@@ -18270,10 +18320,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "wyspa"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr "sklep turystyczny"
@@ -18281,35 +18331,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr "Edycja sklepu ze sprzętem turystycznym"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr "Edycja sklepu sportowego"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr "Edycja optyka"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "Gotówka"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "bank"
@@ -18317,5 +18367,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "Edycja banku"
@@ -18323,10 +18373,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr "kantor"
@@ -18334,5 +18384,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr "Edycja kantoru"
@@ -18340,15 +18390,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "Edycja bankomatu"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "Zdrowie"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr "lekarz"
@@ -18356,20 +18406,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr "Edycja lekarza"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr "dentysta"
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr "Edycja dentysty"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "apteka"
@@ -18377,5 +18427,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "Edycja apteki"
@@ -18383,10 +18433,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr "realizacja recept"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "szpital"
@@ -18394,10 +18444,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "Edycja szpitala"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr ""
@@ -18406,5 +18456,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -18413,20 +18463,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr "Numer punktu"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr "Numer telefonu"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Podaj razem z kodem kraju, np.: +12-345-67890)"
@@ -18434,5 +18484,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr "weterynarz"
@@ -18441,56 +18491,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr "Edycja lecznicy weterynaryjnej"
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr "kontynent"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr "Edycja kontynentu"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr "kraj"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr "Edycja kraju"
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr "stan"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr "Edycja stanu"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr "region"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr "Edycja regionu"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr "okręg"
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr "Edycja okręgu / hrabstwa"
@@ -18498,15 +18547,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr "miasto"
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr "Edycja miasta"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr "miejscowość"
@@ -18514,10 +18563,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr "Edycja miejscowości"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr "dzielnica"
@@ -18525,25 +18574,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr "Edycja dzielnicy"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "wieś"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "Edycja wsi"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr "wólka"
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr "Edycja wólki"
@@ -18551,5 +18600,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr "okolica"
@@ -18557,10 +18606,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr "Edycja okolicy"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "wyspa"
@@ -18568,5 +18617,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "Edycja wyspy"
@@ -18574,5 +18623,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr "wejście do jaskini"
@@ -18580,10 +18629,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr "Edycja wejścia do jaskini"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "wzgórze"
@@ -18591,10 +18640,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "Edycja wzgórza"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr "lodowiec"
@@ -18602,10 +18651,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr "Edycja lodowca"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr "wulkan"
@@ -18613,70 +18662,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr "Edycja wulkanu"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr "Granice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr "narodowa"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr "Edycja granicy narodowej"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr "administracyjna"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr "Edycja granicy administracyjnej"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr "Edycja granicy politycznej"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr "park narodowy"
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr "Edycja granicy parku narodowego"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr "Zagospodarowanie terenu"
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "drzewo"
@@ -18685,15 +18734,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "Edycja drzewa"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr "Nazwa systematyczna"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr "las"
@@ -18702,5 +18751,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr "Edycja lasu"
@@ -18708,17 +18757,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr "iglasty"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr "liściasty"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr "mieszany"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "las"
@@ -18727,14 +18776,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr "Edycja lasu"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr "rezerwat przyrody"
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr "Edycja rezerwatu przyrody"
@@ -18742,25 +18791,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr "rumowisko"
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr "Edycja rumowiska"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr "busz"
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr "Edycja buszu"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr "turnia"
@@ -18768,10 +18817,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr "Edycja turni"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr "wrzosowisko"
@@ -18779,5 +18828,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr "Edycja wrzosowiska"
@@ -18785,5 +18834,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr "zagroda"
@@ -18792,45 +18841,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr "Edycja zagrody"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr "grunty rolne"
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr "Edycja gruntów rolnych"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr "łąka"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr "Edycja łąki"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr "winnica"
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr "Edycja winnicy"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr "ogródki działkowe"
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr "Edycja ogródków działkowych"
@@ -18838,25 +18887,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr "ogród"
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr "Edycja ogrodu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr "Trawa"
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr ""
@@ -18864,10 +18913,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr "miejsce publiczne"
@@ -18875,20 +18924,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr "Edycja miejsca publicznego"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr "park"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr "Edycja parku"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr "Teren rekreacyjny"
@@ -18896,5 +18945,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr "Edycja terenu rekreacyjnego"
@@ -18902,15 +18951,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr "zabudowa mieszkaniowa"
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr "Edycja zabudowy mieszkaniowej"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr "cmentarz"
@@ -18918,9 +18967,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr "Edycja cmentarza"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr "cmentarz"
@@ -18928,39 +18977,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr "Edycja cmentarza"
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr "handel"
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr "Edycja obszaru handlowego"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr "biura i usługi"
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr "Edycja obszaru biur i usług"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr "teren przemysłowy"
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr "Edycja terenu przemysłowego"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr "teren kolejowy"
@@ -18968,15 +19017,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr "Edycja terenu kolejowego"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr "obszar wojskowy"
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr "Edycja obszaru wojskowego"
@@ -18984,55 +19033,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr "budowa"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr "Edycja terenu budowy"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr "teren pod zabudowę"
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr "Edycja terenu pod zabudowę"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr "wysypisko"
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr "Edycja wysypiska śmieci"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr "kamieniołom"
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr "Edycja komieniołomu"
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr ""
@@ -19042,5 +19091,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr ""
@@ -19049,10 +19098,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr "zewnętrzny segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr "wewnętrzny segment"
@@ -19060,5 +19109,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr "ograniczenia skrętu"
@@ -19067,5 +19116,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr "Edycja ograniczenia skrętu"
@@ -19073,34 +19122,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr "Ograniczenie"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr "brak skrętu w lewo"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr "brak skrętu w prawo"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr "zakaz jazdy prosto"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr "zakaz zawracania"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr "nakaz skrętu w prawo"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr "nakaz skrętu w lewo"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr "nakaz jazdy prosto"
@@ -19109,15 +19158,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr "z drogi"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr "przez węzeł lub drogę"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr "do drogi"
@@ -19125,5 +19174,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr ""
@@ -19132,5 +19181,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr ""
@@ -19138,5 +19187,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr ""
@@ -19208,24 +19257,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr "prom"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr ""
@@ -19278,20 +19327,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr "tramway"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr "objazd"
@@ -19305,10 +19354,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr "Opis symboli"
@@ -19316,26 +19365,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr "Sieć"
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "Obrót"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr "proponowany"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr "alternatywny"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr "tymczasowy"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr "połaczenie"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr "Kolor (hex)"
@@ -19344,30 +19399,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr ""
@@ -19403,6 +19458,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19418,5 +19474,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19435,5 +19499,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr ""
@@ -19527,7 +19591,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr "most"
@@ -19792,15 +19856,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr "przestarzały"
@@ -19842,5 +19906,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr ""
@@ -19978,4 +20042,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19987,5 +20057,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19993,5 +20063,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20028,5 +20098,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20050,11 +20120,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr ""
@@ -20078,5 +20148,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20117,5 +20187,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20153,6 +20223,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr "ulica"
@@ -20208,7 +20278,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr ""
@@ -20261,11 +20331,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr ""
@@ -20286,5 +20364,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr ""
@@ -20298,5 +20376,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr ""
@@ -20317,5 +20395,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr ""
@@ -20329,6 +20407,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr ""
@@ -20343,5 +20421,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr ""
@@ -20355,5 +20433,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr "strumień"
@@ -20367,5 +20445,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr "Dok"
@@ -20393,5 +20471,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr "akwedukt"
@@ -20534,5 +20612,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20559,13 +20637,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr ""
@@ -20627,7 +20705,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr ""
@@ -20650,10 +20728,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr ""
@@ -20689,7 +20767,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr ""
@@ -20734,6 +20812,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr ""
@@ -20747,5 +20825,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr "Terminal"
@@ -20767,5 +20845,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr ""
@@ -20779,5 +20857,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr ""
@@ -20785,4 +20863,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20825,7 +20910,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr ""
@@ -20842,5 +20927,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr ""
@@ -20855,5 +20940,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr ""
@@ -20868,5 +20953,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr ""
@@ -20881,5 +20966,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr ""
@@ -20894,5 +20979,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr ""
@@ -20907,5 +20992,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr ""
@@ -20928,4 +21013,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -20936,4 +21028,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -21010,10 +21110,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr "energia"
@@ -21027,5 +21128,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr "nabrzeże"
@@ -21039,5 +21140,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr ""
@@ -21165,12 +21266,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr "wypoczynek"
@@ -21184,5 +21285,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr "marina"
@@ -21254,8 +21355,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr "udogodnienie"
@@ -21357,10 +21458,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr ""
@@ -21380,4 +21481,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21399,4 +21507,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21720,4 +21835,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -21744,24 +21867,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr ""
@@ -21793,6 +21924,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr ""
@@ -21853,8 +21984,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr "zdrowie"
@@ -22207,26 +22338,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr "sklep"
@@ -22281,5 +22412,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22298,8 +22429,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr "hotel"
@@ -22449,9 +22580,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr "turystyka"
@@ -22523,8 +22654,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr "historia"
@@ -22595,8 +22726,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr ""
@@ -22610,5 +22741,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr "kamieniołom"
@@ -22622,5 +22753,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr "Wysypisko smieci"
@@ -22642,5 +22773,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr "Basen"
@@ -22654,5 +22785,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr "las"
@@ -22666,5 +22797,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr ""
@@ -22687,5 +22818,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr ""
@@ -22699,5 +22830,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr "Teren przemysłowy"
@@ -22711,5 +22842,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr ""
@@ -22723,5 +22854,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr ""
@@ -22735,5 +22866,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr "Teren kolejowy"
@@ -22790,7 +22921,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr "Teren wojskowy"
@@ -22804,5 +22935,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr "cmentarz"
@@ -22815,5 +22946,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr "szczyt"
@@ -22828,5 +22959,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr "lodowiec"
@@ -22840,5 +22971,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr "wulkan"
@@ -22893,8 +23024,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr ""
@@ -22908,5 +23039,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr ""
@@ -22920,5 +23051,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr "zdrowie"
@@ -22932,5 +23063,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr "Las naturalny"
@@ -22944,5 +23075,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr "błoto"
@@ -22956,5 +23087,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr "plaża"
@@ -23032,8 +23163,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr "droga"
@@ -23081,7 +23212,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr "granica"
@@ -23223,10 +23354,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr "Miejsce"
@@ -23274,6 +23405,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr "adres"
@@ -23570,75 +23701,69 @@
 msgstr "Terraserver Urban"
 
-#~ msgid "Unknown file extension for file ''{0}''"
-#~ msgstr "Nieznay typ (tczy lyterki na koncu) pliku ''{0}''"
+#~ msgid "Move"
+#~ msgstr "Przenieś"
 
 #~ msgid "Unknown file extension."
 #~ msgstr "Nieznane rozszerzenie pliku."
 
-#~ msgid "Move"
-#~ msgstr "Przenieś"
-
-#~ msgid "Invalid projection"
-#~ msgstr "Nieprawidłowe odwzorowanie"
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Object"
+#~ msgstr "Obiekt"
+
+#~ msgid "true"
+#~ msgstr "prawda"
+
+#~ msgid "false"
+#~ msgstr "fałsz"
+
+#~ msgid "Change"
+#~ msgstr "Zmień"
+
+#~ msgid "Resolve {0} conflicts in {1} objects"
+#~ msgstr "Rozwiąż {0} konfliktów w {1} obiektach"
+
+#~ msgid "unnamed"
+#~ msgstr "bez nazwy"
+
+#~ msgid "Data Layer"
+#~ msgstr "Warstwa danych"
+
+#~ msgid "Not implemented yet."
+#~ msgstr "Jeszcze nie zaimplementowane."
+
+#~ msgid "my version:"
+#~ msgstr "moja wersja:"
+
+#~ msgid "their version:"
+#~ msgstr "ich wersja:"
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Nie można połączyć się z serwerem."
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "Revert"
+#~ msgstr "Wycofaj"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "Użytkownik OSM (email)"
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Nawiązywanie połączenia z serwerem OSM..."
+
+#~ msgid "position"
+#~ msgstr "pozycja"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "Validate"
+#~ msgstr "Zweryfikuj"
 
 #~ msgid "end"
 #~ msgstr "koniec"
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "Object"
-#~ msgstr "Obiekt"
-
-#~ msgid "true"
-#~ msgstr "prawda"
-
-#~ msgid "false"
-#~ msgstr "fałsz"
-
-#~ msgid "Change"
-#~ msgstr "Zmień"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Rozwiąż {0} konfliktów w {1} obiektach"
-
-#~ msgid "unnamed"
-#~ msgstr "bez nazwy"
-
-#~ msgid "Data Layer"
-#~ msgstr "Warstwa danych"
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Jeszcze nie zaimplementowane."
-
-#~ msgid "my version:"
-#~ msgstr "moja wersja:"
-
-#~ msgid "their version:"
-#~ msgstr "ich wersja:"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Nie można połączyć się z serwerem."
-
-#~ msgid "Date"
-#~ msgstr "Data"
-
-#~ msgid "Revert"
-#~ msgstr "Wycofaj"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "Użytkownik OSM (email)"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Nawiązywanie połączenia z serwerem OSM..."
-
-#~ msgid "position"
-#~ msgstr "pozycja"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Validate"
-#~ msgstr "Zweryfikuj"
 
 #~ msgid "Charge"
@@ -23728,7 +23853,4 @@
 #~ "Proszę nie wysyłać żadnych danych po tej wiadomości."
 
-#~ msgid "Rotate"
-#~ msgstr "Obrót"
-
 #~ msgid "Drawbridge"
 #~ msgstr "Most zwodzony"
@@ -23892,4 +24014,7 @@
 #~ msgstr "Ta akcja wymaga wykonania {0} pobrań danych. Kontynuować?"
 
+#~ msgid "Invalid projection"
+#~ msgstr "Nieprawidłowe odwzorowanie"
+
 #~ msgid "Failed to initialize API. Please try again later."
 #~ msgstr "Błąd inicjalizacji API. Proszę spróbować później."
@@ -23903,2 +24028,5 @@
 #~ msgid "Update failed"
 #~ msgstr "Aktualizacja się nie powiodła"
+
+#~ msgid "Unknown file extension for file ''{0}''"
+#~ msgstr "Nieznay typ (tczy lyterki na koncu) pliku ''{0}''"
Index: /applications/editors/josm/i18n/po/pt_BR.po
===================================================================
--- /applications/editors/josm/i18n/po/pt_BR.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/pt_BR.po	(revision 17069)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
-"PO-Revision-Date: 2009-08-06 00:29+0000\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
+"PO-Revision-Date: 2009-08-10 13:31+0000\n"
 "Last-Translator: vitor <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: 2009-08-10 11:57+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -56,6 +56,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -100,6 +100,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "Erro"
@@ -110,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "Alterações Não Salvas"
@@ -128,10 +128,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -148,15 +148,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -186,6 +186,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -215,5 +215,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -374,5 +374,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
 msgstr "Combinar"
@@ -458,9 +458,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -493,7 +493,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -581,37 +581,37 @@
 "{0} nós no caminho {1} ultrapassam o número máximo de nós permitidos {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "dados"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "camada"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "seleção"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "conflito"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "baixar"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Aproximar para {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Aproximar a visão para {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -621,30 +621,30 @@
 msgstr "Visão: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "Não há nada selecionado para se aproximar."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "Não há conflitos para se aproximar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "Combinar Caminhos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "Combinar vários caminho em um só"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "Por favor selecione no mínimo 2 caminhos a combinar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr "Combinar caminhos com membros diferentes?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -654,13 +654,13 @@
 "mesmo assim?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "Combinar assim mesmo"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "Inverter direções?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -670,10 +670,10 @@
 "algum destes?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "Inverter e Combinar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -681,20 +681,20 @@
 msgstr "Entrada de valores para todos conflitos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Resolver conflitos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combinar {0} caminhos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "Todos caminhos estavam vazios"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -743,6 +743,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -764,6 +764,6 @@
 msgstr "Excluir os objetos selecionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -773,5 +773,5 @@
 msgstr "Sobrescrever"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -904,7 +904,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "Exportar dados para arquivo GPX."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -920,5 +919,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -936,5 +935,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -1009,22 +1008,22 @@
 msgstr "Combinar camada atual em outra camada"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "Unir Nós"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "Unir nós no mais antigo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "Por favor selecione no mínimo dois nós para unir."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr "Unir nós com usuários diferentes?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1034,14 +1033,14 @@
 "uni-los?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "Unir mesmo assim"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
 "Não é possivel unir nós: Será necessário deletar o caminho que ainda é usado."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1300,7 +1299,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "Nenhum documento aberto, portanto não há nada a salvar."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1913,5 +1911,5 @@
 msgstr "Erros ao Transferir"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1929,5 +1927,5 @@
 "ignorar.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr "Primitivas deletadas ou movidas"
@@ -1966,11 +1964,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2111,5 +2109,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2189,5 +2187,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Busca por objetos."
@@ -2317,5 +2315,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Buscar"
@@ -2523,5 +2521,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2566,5 +2564,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr "Deletar da relação"
@@ -2606,9 +2604,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "Unir {0} nós"
-msgstr[1] "Unir {0} nós"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2646,9 +2644,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "Rotacionar {0} {1}"
-msgstr[1] "Rotacionar {0} {1}"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2814,7 +2812,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "Mudar {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2824,5 +2822,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2869,5 +2867,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2900,5 +2898,5 @@
 msgstr "parametro ''{0}'' não é uma classe aceitável, obtido ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2912,5 +2910,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "ferrovia"
@@ -2925,5 +2923,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3214,5 +3212,5 @@
 msgstr "Não mostrar novamente"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3224,5 +3222,5 @@
 "internet."
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3234,10 +3232,10 @@
 "dados atual viola uma pré-condição.<br>A mensagem de erro é:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr "Violação de Pré-condição"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3245,25 +3243,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "Desconhecido"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3273,9 +3271,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr "Exceção de segurança"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3284,9 +3282,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr "Exceção de rede"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "Exceção Inesperada"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3296,9 +3306,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "Servidor desconhecido"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3311,5 +3321,5 @@
 "<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr "Primitiva já deletada"
@@ -3399,10 +3409,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "Nome do Usuário"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "Senha"
@@ -3607,15 +3617,15 @@
 msgstr "(nenhum objeto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "camada não está na lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Camada ''{0}'' precisa estar na lista de camadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3671,5 +3681,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr "Meu com o deles"
@@ -3678,5 +3688,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr "Meus com Combinados"
@@ -3685,20 +3695,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr "Versão deles com combinada"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr "regra {0} não participa no par de comparação {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Propriedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3708,6 +3718,6 @@
 msgstr "Etiquetas"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3715,6 +3725,6 @@
 msgstr "Nós"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3722,23 +3732,23 @@
 msgstr "Membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr "Nenhum conflito de tags pendentes a ser resolvido"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "Etiquetas({0} conflitos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr "{0} conflitos de tagueamento à serem resolvidos"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr "Nós (resolvido)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
@@ -3747,17 +3757,17 @@
 "lista de nós desta via."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "Nós (com conflitos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr "Conflitos pendentes na lista de nós desta via"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "Membros(resolvido)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3767,74 +3777,74 @@
 "na lista de membros desta relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "Membros(com conflitos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr "Conflitos pendentes na lista de membros desta relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr "Nenhum conflito de propriedades pendente"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "Propriedades(com conflitos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr "Conflito de propriedades pendente de solução"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "Resolução de Conflito"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr "parâmetro atual fora do intervalo: obtido {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr "lista em regra {0} não está participando de um par comparado"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr "valor inesperado do parâmetro \"index\": {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr "item {0} não encontrado na lista"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr "bloquear scrolling"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr "Comparar "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr "Minha versão"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr "Lista dos elementos dos meu dados, ou seja, dados locais"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr "Versão mesclada"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3844,27 +3854,27 @@
 "as decisões de mesclagem forem aplicadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr "Sua versão"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr ""
 "Lista de elementos de seu conjunto de dados, ou seja, o servidor de dados"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr ">topo"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 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"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr ">botão"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr ""
@@ -3872,5 +3882,5 @@
 "combinados"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3880,5 +3890,5 @@
 "lista de elementos combinados"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3888,5 +3898,5 @@
 "na lista de elementos combinados"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
@@ -3894,5 +3904,5 @@
 "combinados"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr ""
@@ -3900,5 +3910,5 @@
 "combinados"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3908,5 +3918,5 @@
 "selecionado na lista de elementos combinados"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3916,21 +3926,21 @@
 "selecionado na lista de elementos combinados"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr "Acima"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr "Move uma posição acima os elementos selecionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr "Abaixo"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr "Mover para baixo as entradas selecionadas em uma posição"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3939,27 +3949,27 @@
 msgstr "Remover"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr "Remover as entradas selecionadas da lista de elementos combinados"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr "Congelar"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr "Congelar a lista atual de elementos mesclados"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr "Descongelar"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr "Descongelar a lista de elementos mesclados e iniciar mesclagem"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3969,5 +3979,5 @@
 "e as deles</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3978,5 +3988,5 @@
 "entradas e as deles</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3985,5 +3995,5 @@
 msgstr[1] "Minha versão ({0} entradas)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3992,5 +4002,5 @@
 msgstr[1] "Versão combinada ({0} entradas)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -3999,21 +4009,21 @@
 msgstr[1] "Sua versão ({0} entradas)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -4023,5 +4033,5 @@
 msgstr "parâmetro '{0}' não pode ser nulo"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -4033,5 +4043,5 @@
 "no ajuste sincronizado"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -4039,9 +4049,9 @@
 msgstr "ajustável {0} ainda não é registrado"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr "Nó"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4050,10 +4060,10 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr "indice inesperado na coluna. Obtido {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -4064,19 +4074,19 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr "A comunicação com o servidor falhou"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr "Sim, repô-los também"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr "Não, cancelar operação"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -4088,9 +4098,9 @@
 "também?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr "Desfazer a remoção dos nós adicionais?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -4102,13 +4112,13 @@
 "estão apagado no servidor.<br><br>Deseja recuperá-los também?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr "Recuperar primitivas dependentes?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr "Propriedades de meus dados, ou seja, os dados locais"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -4118,90 +4128,90 @@
 "meus elementos quando decisões de combinação forem aplicadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr "Propriedades nos dados dele(s), ou seja, o servidor de dados"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr "Coordenadas:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr "Estado excluído:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr "Estado Visível:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr "(nenhum)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "removido"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr "não apagado"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr "visível (no servidor)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr "não visível (no servidor)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr "Mantenha uma cópia da versão local"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr "Eliminar fisicamente os dados locais"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr "Manter minhas coordenadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr "Mantenha suas coordenadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr "Não decidir conflito entre diferentes coordenadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr "Manter meu estado de apagado"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr "Manter seu estado suprimido"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr "Manter meu estado visível"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr "Sim, resetar id"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr "Não, abortar"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4214,17 +4224,17 @@
 "id. <br> Você concorda? </ html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr "Resetar id para 0"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr "Manter seu estado visível"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr "Sim, limpe-o"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4235,14 +4245,14 @@
 "<br> Concorda? </ html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr "Remover do conjuto de dados"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4250,10 +4260,10 @@
 msgstr "Regra"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr "Primitivo"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
@@ -4261,12 +4271,12 @@
 "resolução"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4274,14 +4284,14 @@
 msgstr "<indefinido>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr "O conjunto de dados combinados não incluirá tag com valor {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4289,7 +4299,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4301,7 +4311,7 @@
 msgstr "Chave"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4314,45 +4324,45 @@
 msgstr "Valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr ""
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr "O parâmetro 'col' deve ser 0 ou 1. Obtido {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr "Minha versão (dados locais)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr "Sua versão (dados do servidor)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ">"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Manter o par chave/valor selecionado dos dados locais"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr "Manter o par chave/valor selecionado dos dados do servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr "Pendente"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr "Marcar as tags selecionadas como indeciso"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4372,8 +4382,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4410,5 +4420,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4514,83 +4524,83 @@
 msgstr "Mostrar histórico da primitiva selecionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "Camadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "Abrir uma lista com camadas carregadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "Excluir camada selecionada."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr "Excluir Camada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr "Confirmação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr "Sim"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr "Não"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr "Apagar tudo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "Mostrar/Ocultar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "Mudar estado de visibilidade do layer selecionado."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
 msgid "Activate"
 msgstr "Ativar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
 msgid "Activate the selected layer"
 msgstr "Ativar camada selecionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr "Combinar esta camada em outra camada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "Mover a camada selecionada uma linha acima."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "Mover camada selecionada uma linha abaixo."
@@ -4600,6 +4610,6 @@
 msgstr "Informação sobre camada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4608,22 +4618,22 @@
 msgstr[1] "Isto modificará {0} objetos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "Um valor vazio apaga a chave."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<diferente>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "Modificar valores?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4631,5 +4641,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4638,40 +4648,40 @@
 msgstr[1] "Modificar propriedades de até {0} objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "Por favor, selecione uma chave"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "Por favor, selecione um valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 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/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "Propriedades/Associações"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "Propriedades dos objetos selecionados."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "Membro de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "Adicionar Propriedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4688,39 +4698,39 @@
 msgstr "Adicionar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 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/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "Editar Propriedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 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/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propriedades: {0} / Membros: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "Propriedades / Associações"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "Modificar relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, 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/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "Excluir a chave selecionada em todos objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "Excluir Propriedades"
@@ -4732,5 +4742,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "Relações"
@@ -4762,31 +4772,31 @@
 msgstr "Criar uma cópia desta relação e abri-la em outra janela de edição"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "Seleção Atual"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "Abrir uma janela de seleção."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "Zoom para elementos selecionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "Atualizar lista de seleção"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "Zoom para seleção."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Sel.: Rel.:{0} / Vias:{1} / Nós:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4794,5 +4804,5 @@
 msgstr "Seleção"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4801,5 +4811,5 @@
 msgstr[1] "{0} vias"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4808,5 +4818,5 @@
 msgstr[1] "{0} relações"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5026,7 +5036,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "Excluir a relação selecionada"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -5109,5 +5118,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5350,5 +5359,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "Lugares"
@@ -5395,21 +5404,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "tipo"
@@ -6217,72 +6226,513 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "Nome"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+"<html>Versão <strong>{0}</strong> criada em <strong>{1}</strong> por <strong>"
+"{2}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr "Verção {0} creado do {2} no {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr "Versão"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr "Imagens para {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr "Ler GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Sem tempo para ponto {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, 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}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr "Não foram encontradas imagens com dados de tempo legíveis"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "Lendo {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr "Imagens Geotagueadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr "Iniciar GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr "Finalizar GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr "delta atual: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr "diferença de zona horária: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "imagem"
+msgstr[1] "imagens"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} dentro da faixa"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "Sincronizar relógio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "Imagens JPEG (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "A data no arquivo \"{0}\" não pode ser analisada."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "Imagem"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Digite data de exibição (mm/dd/aaaa HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr "Zona horária do GPS (diferença com foto)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr "Sincronizar Tempo com Unidade GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr "O tempo informado não pode ser analisado."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr "ponto GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "Personalizar linha"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr "Usar preferências globais."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr "Desenhar linhas entre pontos para esta camada."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr "Não desenhar linhas entre pontos para esta camada."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr "Selecionar opções de linha"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "Personalizar cores"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Padrão"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Selecionar uma cor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr "Marcadores de Pontos Nomeados"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "Importar Áudio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr "Árquivos de Áudio WAV (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Marcadores de audio de {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "Importar imagens"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} trilha, "
+msgstr[1] "{0} trilhas, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} rota, "
+msgstr[1] "{0} rotas, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr "Nome: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr "Descrição: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr "Intervalo de Tempo: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr "Comprimento: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "Converter para camada de dados"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+msgid ""
+"<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 "
+"arriscado.<br> Se quiser enviar dados, consulte aqui:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces (EN)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Convertido de: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr "Descarregar do OSM ao largo desta via"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr "Descargar tudo entre:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr "{0} metros"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr "Área máxima por pedio:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km²"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html> Esta ação irá requerir {0} pedidos <br> individuais para baixar.  "
+"Você deseja </br> continuar? </html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr "Não há trilha GPX disponível na camada para associar áudio."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Camada de dados {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr "fora da área baixada"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr "versão {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr "Atenção: misturando dados de versões 0.6 e 0.5 na versão 0.5"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} consiste em:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} apagado.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr "remover definição"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr "Versão API: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr "Converter para camada GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6291,7 +6741,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6301,446 +6751,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "Nome"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-"<html>Versão <strong>{0}</strong> criada em <strong>{1}</strong> por <strong>"
-"{2}</strong></html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr "Verção {0} creado do {2} no {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr "Versão"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr "Imagens para {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr "Ler GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Sem tempo para ponto {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, 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}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr "Não foram encontradas imagens com dados de tempo legíveis"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Lendo {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr "Imagens Geotagueadas"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr "Iniciar GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr "Finalizar GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr "delta atual: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr "diferença de zona horária: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "imagem"
-msgstr[1] "imagens"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} dentro da faixa"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "Sincronizar relógio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "Imagens JPEG (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "A data no arquivo \"{0}\" não pode ser analisada."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "Imagem"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Digite data de exibição (mm/dd/aaaa HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr "Zona horária do GPS (diferença com foto)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr "Sincronizar Tempo com Unidade GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr "O tempo informado não pode ser analisado."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr "ponto GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "Personalizar linha"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "Usar preferências globais."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr "Desenhar linhas entre pontos para esta camada."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr "Não desenhar linhas entre pontos para esta camada."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr "Selecionar opções de linha"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "Personalizar cores"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Padrão"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Selecionar uma cor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr "Marcadores de Pontos Nomeados"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "Importar Áudio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr "Árquivos de Áudio WAV (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Marcadores de audio de {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "Importar imagens"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} trilha, "
-msgstr[1] "{0} trilhas, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} rota, "
-msgstr[1] "{0} rotas, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr "Nome: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr "Descrição: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr "Intervalo de Tempo: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr "Comprimento: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "Converter para camada de dados"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-msgid ""
-"<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 "
-"arriscado.<br> Se quiser enviar dados, consulte aqui:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces (EN)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Convertido de: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr "Descarregar do OSM ao largo desta via"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr "Descargar tudo entre:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr "{0} metros"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr "Área máxima por pedio:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km²"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html> Esta ação irá requerir {0} pedidos <br> individuais para baixar.  "
-"Você deseja </br> continuar? </html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr "Não há trilha GPX disponível na camada para associar áudio."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Camada de dados {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr "fora da área baixada"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr "versão {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr "Atenção: misturando dados de versões 0.6 e 0.5 na versão 0.5"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} consiste em:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} apagado.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr "remover definição"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr "Versão API: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr "Converter para camada GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -7124,5 +7133,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "Carro"
@@ -7139,16 +7148,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "Bicicleta"
@@ -7176,14 +7187,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "A Pé"
@@ -7392,19 +7406,19 @@
 msgstr "Idioma"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr ""
@@ -7533,34 +7547,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "OSM senha"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
 
@@ -7910,7 +7900,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "Não foi possível ler \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -8015,7 +8005,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "Regra desconhecida \"{0}\"."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8173,23 +8163,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "Senha ou usuário incorreto."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Atenção: A senha é enviada sem encriptação."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "Salvar usuário e senha (sem encriptação)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "Digite a Senha"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
 msgstr "Login"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "OSM senha"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -8199,7 +8213,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-msgstr "se esperava instância de OsmDataLayer ou GpxLayer. Obtido \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -8352,14 +8366,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "Tipo de membro desconhecido para \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "Preparando dados OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr "Identificação de nó mal-formada"
@@ -8815,5 +8829,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr "Descrição"
@@ -9216,5 +9230,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr "Erro ao carregar arquivo"
@@ -9541,5 +9555,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -10075,7 +10089,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr "água"
@@ -10248,7 +10262,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "nome"
+msgstr ""
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10798,12 +10811,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "iniciar"
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0} nó"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -10941,5 +10954,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr "Nome do rua"
@@ -11748,7 +11761,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr ""
@@ -11762,5 +11775,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr ""
@@ -11993,12 +12006,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "Por favor, selecione a linha para editar."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "Selecione camada destino"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
@@ -12011,7 +12022,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "Não há modificações a enviar."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -12022,61 +12032,61 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr ""
@@ -12404,4 +12414,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12438,5 +12450,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr "Ruas"
@@ -12447,5 +12459,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Auto-estrada"
@@ -12454,5 +12466,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr "Editar Auto-estrada"
@@ -12479,8 +12491,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr "Referência"
@@ -12521,21 +12533,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr "Layer"
@@ -12549,8 +12561,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr "Faixas"
@@ -12568,15 +12580,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr "Velocidade máxima (km/h)"
@@ -12613,16 +12625,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr "Mão Única"
@@ -12664,19 +12676,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Ponte"
@@ -12712,19 +12724,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr "Túnel"
@@ -12758,18 +12770,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr "Corte"
@@ -12803,18 +12815,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr ""
@@ -12822,5 +12834,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr ""
@@ -12829,5 +12841,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr ""
@@ -12835,5 +12847,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr ""
@@ -12842,5 +12854,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr ""
@@ -12850,6 +12862,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr ""
@@ -12857,5 +12869,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr ""
@@ -12864,5 +12876,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr ""
@@ -12875,5 +12887,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr ""
@@ -12882,5 +12894,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr ""
@@ -12888,10 +12900,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr ""
@@ -12903,5 +12915,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr ""
@@ -12911,5 +12923,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr ""
@@ -12917,5 +12929,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr ""
@@ -12925,5 +12937,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr ""
@@ -12935,5 +12947,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr ""
@@ -12943,5 +12955,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr ""
@@ -12968,19 +12980,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr "Largura (metros)"
@@ -12992,5 +13004,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Residencial"
@@ -12999,5 +13011,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr "Editar Rua Residencial"
@@ -13021,13 +13033,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr "Superfície"
@@ -13047,20 +13059,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr "pavimentada"
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr "não pavimentada"
@@ -13068,12 +13080,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr ""
@@ -13081,5 +13093,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr ""
@@ -13088,5 +13100,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr ""
@@ -13094,5 +13106,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr "Serviço"
@@ -13101,5 +13113,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr "Editar Rua de Serviço"
@@ -13109,18 +13121,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr "Tipo de Rua de Serviço"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr ""
@@ -13128,5 +13140,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr ""
@@ -13136,5 +13148,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -13142,5 +13154,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -13149,5 +13161,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -13156,20 +13168,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr "Pedágio"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr "Sem saída"
@@ -13182,8 +13194,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr "Acesso"
@@ -13227,23 +13239,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr "sim"
@@ -13256,40 +13268,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr "privado"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr ""
@@ -13302,19 +13314,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr ""
@@ -13337,65 +13349,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr "permitido"
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr ""
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr "não"
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr "Carga"
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Veículos de Carga Pesados"
@@ -13410,10 +13422,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr "Cavalo"
@@ -13429,13 +13441,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr "Motocicleta"
@@ -13451,30 +13463,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr "Automóvel"
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr "Veículos de Serviço Público"
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr "Barco motorizado"
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr "Barco"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr "Velocidade mínima (km/h)"
@@ -13482,25 +13494,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr "Peso máximo (toneladas)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr "Altura máxima (metros)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr "Largura máx. (metros)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr "Comprimento Máx. (metros)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr "Rotatória"
@@ -13511,5 +13523,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr "Editar Junção"
@@ -13531,9 +13543,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr "Tipo"
@@ -13553,10 +13565,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr ""
@@ -13578,10 +13590,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr ""
@@ -13603,10 +13615,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr ""
@@ -13628,6 +13640,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr ""
@@ -13641,9 +13653,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr ""
@@ -13657,9 +13669,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr ""
@@ -13689,10 +13701,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr "serviço"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr ""
@@ -13700,4 +13712,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13715,6 +13734,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr "construção"
@@ -13725,10 +13744,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr "Editar Ponte"
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr "Editar Túnel"
@@ -13736,19 +13755,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr "Vias"
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr "Construção"
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr "Editar Rodovia em Construção"
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr "Junção"
@@ -13764,5 +13783,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr "rotatória"
@@ -13771,5 +13790,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr ""
@@ -13777,5 +13796,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr ""
@@ -13783,5 +13802,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr "Ciclovia"
@@ -13791,5 +13810,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr "Editar Ciclovia"
@@ -13797,5 +13816,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr "Calçada"
@@ -13804,5 +13823,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr "Editar Calçada"
@@ -13810,5 +13829,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr ""
@@ -13817,5 +13836,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr "Editar Calçadão"
@@ -13823,5 +13842,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr "Escada"
@@ -13831,5 +13850,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr "Editar Escadaria"
@@ -13838,5 +13857,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr "Trilha"
@@ -13845,14 +13864,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr "Editar Trilha"
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr "concreto"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr "pedras"
@@ -13860,18 +13879,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr "terra"
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr "grama"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr "areia"
@@ -13879,5 +13898,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr ""
@@ -13886,5 +13905,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr ""
@@ -13892,5 +13911,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr ""
@@ -13899,5 +13918,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr ""
@@ -13905,5 +13924,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr ""
@@ -13912,5 +13931,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr ""
@@ -13918,5 +13937,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr ""
@@ -13925,5 +13944,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr ""
@@ -13931,5 +13950,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr ""
@@ -13938,5 +13957,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -13945,5 +13964,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr "Caminho"
@@ -13952,13 +13971,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr "Edicar Caminho"
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr ""
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr "Ski"
@@ -13966,5 +13985,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr ""
@@ -13974,5 +13993,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr ""
@@ -13980,5 +13999,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr ""
@@ -13988,5 +14007,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr ""
@@ -13994,5 +14013,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr ""
@@ -14002,5 +14021,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr ""
@@ -14008,5 +14027,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr ""
@@ -14016,5 +14035,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr ""
@@ -14022,5 +14041,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr ""
@@ -14030,5 +14049,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr ""
@@ -14036,5 +14055,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr ""
@@ -14044,5 +14063,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr ""
@@ -14050,10 +14069,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr ""
@@ -14061,15 +14080,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr "Número"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr "Serviços"
@@ -14077,5 +14096,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr ""
@@ -14110,14 +14129,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr "Operador"
@@ -14126,5 +14145,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr "Sinal de Trânsito"
@@ -14134,5 +14153,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr "Tipo de cruzamento de pedestres"
@@ -14141,27 +14160,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr "faixa de pedestre (sem sinal)"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr "sinal de trânsito"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr "ilha"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr "sem faixa"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr "Travessia à cavalo"
@@ -14169,6 +14188,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr "Travessia de bicicleta"
@@ -14177,11 +14196,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr "Guarda de trânsito"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -14189,30 +14208,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr "Pare"
@@ -14220,5 +14239,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr "Faixa de Pedestres"
@@ -14227,14 +14246,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr "Editar Faixa de Pedestres"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr "Mini-rotatória"
@@ -14245,14 +14264,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr "Direção"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr "sentido horário"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr ""
@@ -14262,20 +14281,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr "Limite da Cidade"
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr "Editar Placa de Limite da Cidade"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr "Radar de Velocidade"
@@ -14283,5 +14302,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr "Telefone de Emergência"
@@ -14289,5 +14308,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr "Aclive"
@@ -14295,5 +14314,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr ""
@@ -14302,10 +14321,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr ""
@@ -14313,5 +14332,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr ""
@@ -14319,5 +14338,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -14329,7 +14348,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr "Altitude"
@@ -14337,5 +14356,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr "Barreiras"
@@ -14343,5 +14362,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr ""
@@ -14349,5 +14368,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr ""
@@ -14386,18 +14405,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr ""
@@ -14406,5 +14429,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr ""
@@ -14412,5 +14435,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr ""
@@ -14418,10 +14441,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr ""
@@ -14429,15 +14452,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr ""
@@ -14445,5 +14468,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr ""
@@ -14451,10 +14474,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr ""
@@ -14464,5 +14487,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr ""
@@ -14471,5 +14494,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr ""
@@ -14478,5 +14501,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr ""
@@ -14484,5 +14507,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr ""
@@ -14491,5 +14514,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr ""
@@ -14501,15 +14524,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr "Entrada"
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr "Editar Entrada"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr ""
@@ -14517,50 +14540,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr ""
@@ -14568,15 +14591,26 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+msgid "Turnstile"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "Editar Túnel"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr ""
@@ -14587,10 +14621,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr ""
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr ""
@@ -14598,5 +14632,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr ""
@@ -14604,5 +14638,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr ""
@@ -14610,10 +14644,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr ""
@@ -14621,10 +14655,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr ""
@@ -14632,10 +14666,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr ""
@@ -14645,5 +14679,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr ""
@@ -14651,15 +14685,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr ""
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr ""
@@ -14667,15 +14701,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr ""
@@ -14683,15 +14717,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -14699,5 +14733,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr ""
@@ -14706,10 +14740,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr ""
@@ -14720,14 +14754,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr ""
@@ -14741,35 +14775,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr ""
@@ -14777,20 +14811,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr ""
@@ -14798,10 +14832,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr ""
@@ -14809,5 +14843,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr ""
@@ -14815,5 +14849,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr ""
@@ -14821,5 +14855,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr ""
@@ -14828,5 +14862,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr ""
@@ -14834,10 +14868,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr ""
@@ -14845,5 +14879,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr ""
@@ -14851,5 +14885,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr ""
@@ -14857,15 +14891,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr ""
@@ -14874,5 +14908,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr ""
@@ -14880,20 +14914,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr ""
@@ -14902,15 +14936,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr ""
@@ -14918,10 +14952,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr ""
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr ""
@@ -14929,10 +14963,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr ""
@@ -14942,5 +14976,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr ""
@@ -14948,10 +14982,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr ""
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr ""
@@ -14959,5 +14993,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr ""
@@ -14987,8 +15021,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr ""
@@ -15002,35 +15036,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr ""
@@ -15038,45 +15072,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr ""
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr ""
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr ""
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr "Bonde/VLT"
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr "Editar Bonde/VLT"
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr ""
@@ -15084,5 +15118,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -15091,14 +15125,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr ""
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr ""
@@ -15107,5 +15141,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr ""
@@ -15114,5 +15148,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr ""
@@ -15122,5 +15156,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr ""
@@ -15128,5 +15162,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr ""
@@ -15135,10 +15169,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr ""
@@ -15146,10 +15180,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr ""
@@ -15157,10 +15191,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr ""
@@ -15168,10 +15202,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr ""
@@ -15179,5 +15213,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr ""
@@ -15185,5 +15219,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr "Estação"
@@ -15194,10 +15228,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr "Editar Estação"
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr "Posto de Gasolina"
@@ -15207,5 +15241,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr "Editar Posto de Gasolina"
@@ -15221,5 +15255,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15229,5 +15263,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr "Editar Estacionamento"
@@ -15235,41 +15269,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr "Taxa"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr "Lava Jato"
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr "Editar Lava Jato"
@@ -15277,5 +15311,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr "Loja"
@@ -15283,15 +15317,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr "Editar Loja de Carros"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr "Oficina"
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr "Editar Oficina"
@@ -15299,5 +15333,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr "Aluguel"
@@ -15306,10 +15340,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr "Editar Aluguel de Carros"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr "Compartilhamento"
@@ -15317,5 +15351,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr "Editar Compartilhamento de Carro"
@@ -15323,5 +15357,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr "Editar Bicicletário"
@@ -15330,5 +15364,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr "Editar Aluguel de Bicicletas"
@@ -15337,15 +15371,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr "Editar Loja de Bicicletas"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "Transporte Público"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr ""
@@ -15353,5 +15387,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr ""
@@ -15359,5 +15393,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr ""
@@ -15365,5 +15399,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr "Parada do Bonde/VLT"
@@ -15372,5 +15406,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr "Editar Parada do Bonde/VLT"
@@ -15378,5 +15412,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr "Plataforma de Trens"
@@ -15385,5 +15419,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr "Editar Plataforma de Trens"
@@ -15395,5 +15429,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr ""
@@ -15401,10 +15435,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr "Entrada do Metrô"
@@ -15413,10 +15447,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr "Editar Entrada do Metrô"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr ""
@@ -15425,5 +15459,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr "Terminal de Ônibus"
@@ -15432,5 +15466,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr "Editar Terminal de Ônibus"
@@ -15438,5 +15472,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr "Ponto de Ônibus"
@@ -15446,5 +15480,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr "Editar Ponto de Ônibus"
@@ -15455,6 +15489,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr "Abrigo"
@@ -15462,10 +15496,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr "Plataforma de Ônibus"
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr "Editar Plataforma de Ônibus"
@@ -15473,5 +15507,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr "Táxi"
@@ -15479,5 +15513,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr "Editar Ponto de Táxi"
@@ -15485,5 +15519,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr "Aeroporto"
@@ -15491,15 +15525,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr "Editar Aeroporto"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr ""
@@ -15508,5 +15542,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr "Acomodação"
@@ -15518,5 +15552,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -15525,15 +15559,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr ""
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr ""
@@ -15541,20 +15575,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr "Chalé"
@@ -15562,10 +15596,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr "Editar Chalé"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr "Albergue"
@@ -15573,30 +15607,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr "Editar Albergue"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr ""
@@ -15604,10 +15638,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "Comida e Bebida"
@@ -15618,5 +15652,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurante"
@@ -15624,5 +15658,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr "Editar Restaurante"
@@ -15630,5 +15664,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr "Cozinha"
@@ -15636,61 +15670,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr "italiana"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr "chinessa"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr "hambúrguer"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr "grega"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr "alemã"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr "indiana"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr "turca"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr "asiática"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr "tailandesa"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr "mexicana"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr "japonesa"
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr "Lanchonete"
@@ -15698,9 +15732,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr "Editar Lanchonete Fast-Food"
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr "Café"
@@ -15708,10 +15742,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr "Editar Café"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr "Bar/Pub"
@@ -15719,20 +15753,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr "Editar Bar/Pub"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr ""
@@ -15740,10 +15774,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr "Boate"
@@ -15751,20 +15785,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr "Editar Boate"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr "Atração"
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr "Editar Atração Turística"
@@ -15773,11 +15807,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr "Horário de Funcionamento"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "Museu"
@@ -15785,10 +15819,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr "Editar Museu"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "Zoológico"
@@ -15797,10 +15831,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr "Editar Zoológico"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr "Mirante"
@@ -15808,25 +15842,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr "Editar Mirante"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr "Parque Temático"
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr "Editar Parque Temático"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr "Arte"
@@ -15834,5 +15868,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr "Editar Arte"
@@ -15840,5 +15874,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr "Centro de Informações Turísticas"
@@ -15846,80 +15880,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr "Editar Centro de Informações Turísticas"
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr "Tipo de Mapa"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr "mapa"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr "mapa da cidade"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr ""
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr "mapa de ciclovias"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
 msgid "Closer Description"
 msgstr ""
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1701
 msgid "Information Board"
 msgstr "Quadro de Informações"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Board Type"
 msgstr "Tipo de Quadro"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "board"
 msgstr "quadro"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "history"
 msgstr "história"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "nature"
 msgstr "natureza"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "wildlife"
 msgstr "vida selvagem"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Guidepost (Hiking)"
 msgstr ""
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr "Outros Pontos de Informação"
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr "Editar Abrigo"
@@ -15927,25 +15961,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr "Lareira"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr "Campo de Picnic"
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr "Editar Campo de Picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "Lugares Históricos"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "Castelo"
@@ -15954,20 +15988,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr "Editar Castelo"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "Ruínas"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr "Editar Ruínas"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr "Sítio Arqueológico"
@@ -15976,10 +16010,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr "Editar Sítio Arqueológico"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr "Campo de Batalha"
@@ -15987,5 +16021,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr "Editar Campo de Batalha"
@@ -15993,15 +16027,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr "Monumento"
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr "Editar Monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr "Memorial"
@@ -16009,45 +16043,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr "Editar Memorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr "Cruz de beira de estrada"
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr "Editar Cruz de beira de estrada"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "Lazer"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr "Parque Aquático"
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr "Editar Parque Aquático"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "Parquinho"
@@ -16055,15 +16089,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr "Editar Parquinho"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "Pescaria"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr "Editar Pescaria"
@@ -16071,15 +16105,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "Estádio"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr "Editar Estádio"
@@ -16093,6 +16127,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "selecionar esporte:"
@@ -16115,4 +16149,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -16173,5 +16215,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16181,5 +16231,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16325,5 +16375,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16429,5 +16479,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16468,29 +16518,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr "esporte"
@@ -16500,227 +16551,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr "arco e flecha"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr "atletismo"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr "futebol australiano"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr "basquete"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr "boliche"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr "canoagem"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr "escalada"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr "críquete"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr "corrida de cachorros"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr "futebol americano"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr "golfe"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr "ginástica olímpica"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr "hóquei"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr "corrida de cavalos"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr "automobilismo"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr "esqui"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "futebol"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr "natação"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "ping-pong"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr "tênis"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr "Centro de Esportes"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr "Editar Centro de Esportes"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr ""
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr "Mini-Golf"
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr "Editar Mini-Golf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr ""
@@ -16759,191 +16810,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr "estádio"
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr ""
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr ""
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr ""
@@ -16951,56 +17002,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr ""
@@ -17008,178 +17059,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr "Editar Campo de Baseball"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "Construções"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr ""
@@ -17187,5 +17238,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "Prédio Público"
@@ -17193,10 +17244,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr "Editar Prédio Público"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "Prefeitura"
@@ -17204,10 +17255,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "Editar Prefeitura"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "Embaixada"
@@ -17215,10 +17266,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "Editar Embaixada"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "Fórum"
@@ -17227,10 +17278,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "Editar Fórum"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "Presídio"
@@ -17239,10 +17290,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "Editar Presídio"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "Polícia"
@@ -17252,10 +17303,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "Editar Polícia"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "Bombeiros"
@@ -17264,10 +17315,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "Editar Bombeiros"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "Correios"
@@ -17275,5 +17326,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr "Editar Correios"
@@ -17281,15 +17332,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr "Creche"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr "Editar Creche"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "Escola"
@@ -17297,10 +17348,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "Editar Escola"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr "Universidade"
@@ -17308,10 +17359,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr "Editar Universidade"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr "Faculdade"
@@ -17319,5 +17370,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr "Editar Faculdade"
@@ -17325,5 +17376,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "Cinema"
@@ -17332,10 +17383,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "Editar Cinema"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "Biblioteca"
@@ -17344,10 +17395,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "Editar Biblioteca"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr "Centro de Artes"
@@ -17355,10 +17406,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr "Editar Centro de Artes"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "Teatro"
@@ -17367,10 +17418,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "Editar Teatro"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr "Lugar de Adoração"
@@ -17380,5 +17431,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr "Editar Lugar de Adoração"
@@ -17387,6 +17438,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr ""
@@ -17395,66 +17446,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr "budismo"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr "cristianismo"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr "hinduísmo"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr "jainismo"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr "judaísmo"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr "muçulmano"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr "sikhismo"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr "espiritismo"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr "taoísmo"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr "unitarianismo"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr "zoroastrianismo"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr "Denominação"
@@ -17463,81 +17514,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr "anglicana"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr "batista"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr "católica"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr "evangélica"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr "testemunha de jeová"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr "luterana"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr "mórmon"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr "ortodoxa"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr "presbiteriana"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr "xiismo"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr "sunismo"
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr "Endereços"
@@ -17546,5 +17597,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr "Editar Informações de Endereço"
@@ -17552,5 +17603,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr "Número da casa"
@@ -17558,20 +17609,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr "Nome da casa"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr "Cidade"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "CEP"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr "Código do país"
@@ -17579,5 +17630,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr "Interpolação de Endereços"
@@ -17586,5 +17637,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr "Editar Interpolação de Endereços"
@@ -17592,71 +17643,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr "Esquema de numeração"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr "números ímpares"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr "números pares"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr "todos os números"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr "alfabético"
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr "Fábrica"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr "Editar Fábrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "Torre"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "Editar Torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "Torre de Água"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "Editar Torre de Água"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr "Gasômetro"
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr "Editar Gasômetro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "Farol"
@@ -17664,10 +17715,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "Editar Farol"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "Moinho de Vento"
@@ -17675,10 +17726,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "Editar Moinho de Vento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "Cano"
@@ -17686,10 +17737,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "Editar Cano"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr "Estação de Tratamento de Esgoto"
@@ -17699,10 +17750,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr "Editar Estação de Tratamento de Esgoto"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr "Guindaste"
@@ -17710,10 +17761,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr "Editar Guindaste"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr ""
@@ -17721,10 +17772,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr "Vértice Geodésico"
@@ -17732,10 +17783,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr "Editar Vértice Geodésico"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr "Câmera de Vigilância"
@@ -17743,5 +17794,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr "Editar Câmera de Vigilância"
@@ -17749,5 +17800,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr "Gerador de Energia"
@@ -17757,39 +17808,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr "Editar Gerador de Energia"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr "eólica"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr "hidrelétrica"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr "fóssil"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr "carvão"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr "gás"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr "Estação de Energia"
@@ -17798,10 +17849,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr "Editar Estação de Energia"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr "Subestação de Energia"
@@ -17810,5 +17861,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr "Editar Subestação de Energia"
@@ -17816,10 +17867,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr "Torre de Energia"
@@ -17830,5 +17881,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr "Editar Torre de Energia"
@@ -17836,5 +17887,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr "Linha de transmissão"
@@ -17843,25 +17894,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr "Editar Linha de Transmissão"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr "Voltagem"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr "Quantidade de Cabos"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr "Comodidades"
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "Banheiros"
@@ -17869,20 +17920,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr "Número de Referência"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr "Caixa de Correio"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "Telefone"
@@ -17891,5 +17942,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr "Editar Telefone"
@@ -17897,5 +17948,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "Moedas"
@@ -17903,5 +17954,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr "Notas"
@@ -17909,5 +17960,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -17915,5 +17966,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr ""
@@ -17921,15 +17972,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "Cartão de Crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "Cartão Telefônico"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr "Reciclagem"
@@ -17938,5 +17989,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr ""
@@ -17944,35 +17995,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr "Baterias"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr "Latas"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr "Roupas"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr "Vidro"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr "Ferro Velho"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr "Banco"
@@ -17981,20 +18032,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr ""
@@ -18002,22 +18053,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr "Altura"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr "baixa"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr "Chafariz"
@@ -18026,10 +18077,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr "Editar Chafariz"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "Bebedouro"
@@ -18038,10 +18089,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "Editar Bebedouro"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr ""
@@ -18049,25 +18100,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "Lojas"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr "Supermercado"
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr "Editar Supermercado"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr "Loja de Conveniência"
@@ -18075,10 +18126,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr "Editar Loja de Conveniência"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr "Quiosque"
@@ -18086,10 +18137,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr "Editar Quiosque"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr ""
@@ -18097,5 +18148,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "Editar Máquina de Vendas"
@@ -18103,88 +18154,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "Produtos à venda"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr "tíquetes de transporte público"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr "mapas de transporte público"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr "tíquetes de estacionamento"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr "comida"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "bebidas"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr "doces"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr "cigarros"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr "fotos"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr "ração animal"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "jornais"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "brinquedos"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr "selos"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "Cartões SIM"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr "preservativos"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr "absorventes"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr "sacos para fezes"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr "Cartões de fidelidade"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "Açougue"
@@ -18192,10 +18243,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "Editar Açougue"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "Padaria"
@@ -18203,10 +18254,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "Editar Padaria"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr "Floricultura"
@@ -18214,20 +18265,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr "Editar Floricultura"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr "Orgânicos"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr "Editar Loja de Orgânicos"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr "Álcool"
@@ -18235,60 +18286,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr ""
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr "Bebidas"
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr "Editar Loja de Bebidas"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr "Computador"
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr "Editar Loja de Computador"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr "Eletrônicos"
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr "Editar Loja de Eletrônicos"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr "Equipamentos de Áudio"
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr "Editar Loja de Equipamentos de Áudio"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr "Móveis"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr "Editar Loja de Móveis"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr "Loja de Plantas"
@@ -18296,10 +18347,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr "Editar Loja de Plantas"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr ""
@@ -18307,10 +18358,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr "Editar Loja de Utilidades Domésticas"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -18318,60 +18369,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr "Papelaria"
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr "Editar Papelaria"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr "Cabelereiro"
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr "Editar Cabelereiro"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr "Sapatos"
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr "Editar Loja de Sapatos"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr "Brinquedos"
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr "Editar Loja de Brinquedos"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr "Locadora de Vídeo"
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr "Editar Locadora de Vídeo"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "Lavanderia à Seco"
@@ -18379,10 +18430,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "Editar Lavanderia à Seco"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "Lavanderia"
@@ -18390,10 +18441,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "Editar Lavanderia"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr ""
@@ -18401,35 +18452,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr "Esportes"
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr "Editar Loja de Esportes"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr "Óculos"
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr "Editar Loja de Óculos"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "Dinheiro"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "Banco"
@@ -18437,5 +18488,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "Editar Banco"
@@ -18443,10 +18494,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "Caixa Eletrônico"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr "Loja de Câmbio"
@@ -18454,5 +18505,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr "Editar Loja de Câmbio"
@@ -18460,15 +18511,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "Editar Caixa Eletrônico"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "Saúde"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr "Médicos"
@@ -18476,20 +18527,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr "Editar Médicos"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr "Dentistas"
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr "Editar Dentistas"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "Farmácia"
@@ -18497,5 +18548,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "Editar Farmácia"
@@ -18503,10 +18554,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "Hospital"
@@ -18514,10 +18565,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "Editar Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr "Entrada de Emergência"
@@ -18526,5 +18577,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr "Editar Entrada de Emergência"
@@ -18533,20 +18584,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr "Número de telefone"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Use código internacional, como +12-345-67890)"
@@ -18554,5 +18605,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr "Veterinária"
@@ -18561,56 +18612,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr "Editar Veterinária"
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr "Continente"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr "Editar Continente"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr "País"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr "Editar País"
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr "Estado"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr "Editar Estado"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr "Região"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr "Editar Região"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr "Condado"
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr "Editar Condado"
@@ -18618,15 +18668,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr "Cidade"
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr "Editar Cidade (mais que 100 mil habitantes)"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr "Cidade (menos que 100 mil habitantes)"
@@ -18634,10 +18684,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr "Editar Cidade (menos que 100 mil habitantes)"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr "Bairro"
@@ -18645,25 +18695,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr "Editar Bairro"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "Vilarejo"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "Editar Vilarejo"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr ""
@@ -18671,5 +18721,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr ""
@@ -18677,10 +18727,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "Ilha"
@@ -18688,5 +18738,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "Editar Ilha"
@@ -18694,5 +18744,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr "Entrada de Caverna"
@@ -18700,10 +18750,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr "Editar Entrada de Caverna"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "Pico"
@@ -18711,10 +18761,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "Editar Pico"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr "Geleira"
@@ -18722,10 +18772,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr "Editar Geleira"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr "Vulcão"
@@ -18733,70 +18783,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr "Editar Vulcão"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr "Fronteiras"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr "Nacional"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr "Editar Fronteiras Nacionais"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr "Administrativo"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr "Editar Fronteiras Administrativas"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr "Civil"
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr "Editar Fronteiras Civis"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr "Político"
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr "Editar Fronteiras Políticas"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr "Parque nacional"
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr "Editar Fronteira de Parque Nacional"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr "Uso da terra"
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "Árvore"
@@ -18805,15 +18855,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "Editar Árvore"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr "Nome Botânico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr "Floresta"
@@ -18822,5 +18872,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr "Editar Floresta"
@@ -18828,17 +18878,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr "conífera"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr "decídua"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr "misturado"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "Floresta"
@@ -18847,14 +18897,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr "Reserva Natural"
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr "Editar Reserva Natural"
@@ -18862,25 +18912,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr "Arbusto"
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr "Editar arbusto"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr ""
@@ -18888,10 +18938,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr "Editar rocha"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr "Matagal"
@@ -18899,5 +18949,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr "Editar matagal"
@@ -18905,5 +18955,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr ""
@@ -18912,45 +18962,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -18958,25 +19008,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr "Jardim"
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr "Editar Jardim"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr ""
@@ -18984,10 +19034,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr ""
@@ -18995,20 +19045,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr "Parque"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr "Editar Parque"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr "área de recreação"
@@ -19016,5 +19066,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -19022,15 +19072,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr "Área residencial"
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr "Cemitério"
@@ -19038,9 +19088,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr "Editar Cemitério"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr "Cemitério"
@@ -19048,39 +19098,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr "Comercial"
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr ""
@@ -19088,15 +19138,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr "Militar"
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr ""
@@ -19104,55 +19154,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr "Área de construção"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr "Pedreira"
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr "Multipolígono"
@@ -19162,5 +19212,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr "Editar Multipolígono"
@@ -19169,10 +19219,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr "segmento externo"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr "segmento interno"
@@ -19180,5 +19230,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr "Restrição de manobra"
@@ -19187,5 +19237,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr "Editar restrição de manobras"
@@ -19193,34 +19243,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr "Restrição"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr "proibida_conversão_esquerda"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr "proibida_conversão_direita"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr "proibido_em_frente"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr "proibido_retornar"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr "somente_a_direita"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr "somente_a_esuqerda"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr "somente_em_frente"
@@ -19229,15 +19279,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr "do caminho"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr "nó de via ou caminho"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr "para caminho"
@@ -19245,5 +19295,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr ""
@@ -19252,5 +19302,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr ""
@@ -19258,5 +19308,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr "Tipo de rota"
@@ -19328,24 +19378,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr "ônibus"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr "estrada"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr "Ferry"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr "Esqui"
@@ -19398,20 +19448,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr "caminhada"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr "bonde/VLT"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr "desvio"
@@ -19425,10 +19475,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr "Metrô"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr "Descrição de símbolo"
@@ -19436,26 +19486,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr ""
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "Tipo de rota"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr "Proposto"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr "alternativa"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr "temporário"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr "Cor (hex)"
@@ -19464,30 +19520,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr "segmento de rota"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr "segmento em frente"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr "Ponto de parada"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr "ponto de parada em frente"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr "ponto de parada atrás"
@@ -19523,6 +19579,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19538,5 +19595,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19555,5 +19620,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr ""
@@ -19647,7 +19712,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr "ponte"
@@ -19912,15 +19977,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr "depreciado"
@@ -19962,5 +20027,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr "cavalo"
@@ -20098,4 +20163,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20107,5 +20178,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20113,5 +20184,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20148,5 +20219,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20170,11 +20241,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr ""
@@ -20198,5 +20269,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20237,5 +20308,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20273,6 +20344,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr "estrada"
@@ -20328,7 +20399,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr "trilha_autoestrada"
@@ -20381,11 +20452,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr "trilho"
@@ -20406,5 +20485,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr ""
@@ -20418,5 +20497,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr ""
@@ -20437,5 +20516,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr "rótula"
@@ -20449,6 +20528,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr ""
@@ -20463,5 +20542,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr "margem de rio"
@@ -20475,5 +20554,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr "fluxo"
@@ -20487,5 +20566,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr "doca"
@@ -20513,5 +20592,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr "aqueduto"
@@ -20654,5 +20733,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20679,13 +20758,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr ""
@@ -20747,7 +20826,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr "ponto de ferrovia"
@@ -20770,10 +20849,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr ""
@@ -20809,7 +20888,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr ""
@@ -20854,6 +20933,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr "aerovia"
@@ -20867,5 +20946,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr "terminal"
@@ -20887,5 +20966,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr "aerovia_escuro"
@@ -20899,5 +20978,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr "aerovia_claro"
@@ -20905,4 +20984,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20945,7 +21031,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr ""
@@ -20962,5 +21048,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr "pista_fácil"
@@ -20975,5 +21061,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr "pista_intermediária"
@@ -20988,5 +21074,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr "pista_avançada"
@@ -21001,5 +21087,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr ""
@@ -21014,5 +21100,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr "pista_livre"
@@ -21027,5 +21113,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr "pista_novatos"
@@ -21048,4 +21134,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -21056,4 +21149,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -21130,10 +21231,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr "energia"
@@ -21147,5 +21249,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr "pier"
@@ -21159,5 +21261,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr "canalização"
@@ -21285,12 +21387,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr "lazer"
@@ -21304,5 +21406,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr "marina"
@@ -21374,8 +21476,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr ""
@@ -21477,10 +21579,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr ""
@@ -21500,4 +21602,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21519,4 +21628,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21840,4 +21956,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -21864,24 +21988,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr ""
@@ -21913,6 +22045,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr ""
@@ -21973,8 +22105,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr "saúde"
@@ -22327,26 +22459,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr "loja"
@@ -22401,5 +22533,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22418,8 +22550,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr "hotel"
@@ -22569,9 +22701,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr "turismo"
@@ -22643,8 +22775,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr "histórico"
@@ -22715,8 +22847,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr ""
@@ -22730,5 +22862,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr ""
@@ -22742,5 +22874,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr "aterro"
@@ -22762,5 +22894,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr ""
@@ -22774,5 +22906,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr "floresta"
@@ -22786,5 +22918,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr "fazenda"
@@ -22807,5 +22939,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr "venda"
@@ -22819,5 +22951,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr "industrial"
@@ -22831,5 +22963,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr "Área contaminada"
@@ -22843,5 +22975,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr "campo"
@@ -22855,5 +22987,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr ""
@@ -22910,7 +23042,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr "exército"
@@ -22924,5 +23056,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr "Cemitério"
@@ -22935,5 +23067,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr "cume"
@@ -22948,5 +23080,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr "geleira"
@@ -22960,5 +23092,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr "vulcão"
@@ -23013,8 +23145,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr ""
@@ -23028,5 +23160,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr "arbusto"
@@ -23040,5 +23172,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr ""
@@ -23052,5 +23184,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr "madeira"
@@ -23064,5 +23196,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr "lama"
@@ -23076,5 +23208,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr "praia"
@@ -23152,8 +23284,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr "rota"
@@ -23201,7 +23333,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr "limite"
@@ -23343,10 +23475,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr "lugar"
@@ -23394,6 +23526,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr "endereço"
@@ -23690,15 +23822,15 @@
 msgstr "Terraserver Urban"
 
+#~ msgid "Aborting..."
+#~ msgstr "Interrompendo..."
+
+#~ msgid "Rotate"
+#~ msgstr "Rotacionar"
+
+#~ msgid "Change"
+#~ msgstr "Alterar"
+
 #~ msgid "Move"
 #~ msgstr "Mover"
-
-#~ msgid "Aborting..."
-#~ msgstr "Interrompendo..."
-
-#~ msgid "Rotate"
-#~ msgstr "Rotacionar"
-
-#~ msgid "Change"
-#~ msgstr "Alterar"
 
 #~ msgid ""
@@ -23838,17 +23970,4 @@
 #~ "<br>Mude sua projeção para evitar esta notificação.<br>Pretende continuar?"
 
-#~ msgid ""
-#~ "Failed to access system property ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "Falha ao acessar propriedade de sistema ''{0}'' por razões de segurança. "
-#~ "Exceção foi: {1}"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Extensão de arquivo desconhecida."
-
-#~ msgid "end"
-#~ msgstr "terminar"
-
 #~ msgid "YAHOO (GNOME)"
 #~ msgstr "YAHOO! (GNOME)"
@@ -23882,4 +24001,7 @@
 #~ msgid "unnamed"
 #~ msgstr "sem nome"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Extensão de arquivo desconhecida."
 
 #~ msgid "Failed to initialize API. Please try again later."
@@ -23930,2 +24052,12 @@
 #~ msgid "No data"
 #~ msgstr "Não há dados"
+
+#~ msgid "end"
+#~ msgstr "terminar"
+
+#~ msgid ""
+#~ "Failed to access system property ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+#~ msgstr ""
+#~ "Falha ao acessar propriedade de sistema ''{0}'' por razões de segurança. "
+#~ "Exceção foi: {1}"
Index: /applications/editors/josm/i18n/po/ro.po
===================================================================
--- /applications/editors/josm/i18n/po/ro.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/ro.po	(revision 17069)
@@ -8,6 +8,6 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
-"PO-Revision-Date: 2009-08-04 10:37+0000\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
+"PO-Revision-Date: 2009-08-10 13:10+0000\n"
 "Last-Translator: Manuel R. Ciosici <manuelciosici@yahoo.com>\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: 2009-08-10 11:57+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: ROMANIA\n"
@@ -60,6 +60,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -69,5 +69,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -104,6 +104,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "Eroare"
@@ -116,5 +116,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "Modificări nesalvate"
@@ -134,10 +134,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -154,15 +154,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -192,6 +192,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -221,5 +221,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -377,5 +377,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
 msgstr ""
@@ -459,9 +459,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -494,7 +494,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -575,37 +575,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "date"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "strat"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "selecţie"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "conflict"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "descărcare"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Apropie la {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Apropie vederea la {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -615,30 +615,30 @@
 msgstr "Vedere: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "Combină calea"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "Combină mai multe căi într-una."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "Selectează te rog cel puţin două căi pentru a le combina."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -646,13 +646,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "Combină oricum"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "Schimbă direcţiile?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -662,10 +662,10 @@
 "din ele?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "Inversează şi Combină"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -673,20 +673,20 @@
 msgstr "Introdu valori pentru toate conflictele."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Rezolvă Conflictele"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combină {0} căi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -731,6 +731,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -752,6 +752,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -761,5 +761,5 @@
 msgstr "Suprascrie"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -891,7 +891,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "Exportă datele într-un fişier GPX."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -907,5 +906,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -923,5 +922,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -993,22 +992,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1016,13 +1015,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1276,7 +1275,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "Nu este nici un document deschis, nu este nimic de salvat."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1855,5 +1853,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1865,5 +1863,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr ""
@@ -1900,11 +1898,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2042,5 +2040,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2111,5 +2109,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Caută obiecte"
@@ -2233,5 +2231,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Căutare"
@@ -2430,5 +2428,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2469,5 +2467,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr ""
@@ -2509,5 +2507,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2548,5 +2545,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2708,7 +2704,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "Schimb {0} obiect"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2718,5 +2714,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2765,5 +2761,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2796,5 +2792,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2808,5 +2804,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr ""
@@ -2821,5 +2817,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3098,5 +3094,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3105,5 +3101,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3113,10 +3109,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3124,25 +3120,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "necunoscut"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3152,9 +3148,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3163,9 +3159,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "Excepţie netratată"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3175,9 +3183,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "Gazdă necunoscută"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3187,5 +3195,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr ""
@@ -3269,10 +3277,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "Nume utilizator"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "Parolă"
@@ -3477,15 +3485,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "stratul nu este în listă."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3539,5 +3547,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr ""
@@ -3546,5 +3554,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr ""
@@ -3553,20 +3561,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3576,6 +3584,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3583,6 +3591,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3590,40 +3598,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3631,74 +3639,74 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3706,30 +3714,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3737,5 +3745,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3743,13 +3751,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3757,5 +3765,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3763,21 +3771,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3786,27 +3794,27 @@
 msgstr "Elimină"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3814,5 +3822,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3821,5 +3829,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3828,5 +3836,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3835,5 +3843,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -3842,21 +3850,21 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -3866,5 +3874,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -3874,5 +3882,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -3880,19 +3888,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -3901,19 +3909,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -3922,9 +3930,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -3934,13 +3942,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -3948,90 +3956,90 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "şters"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4041,17 +4049,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4060,14 +4068,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4075,21 +4083,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4097,14 +4105,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4112,7 +4120,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4124,7 +4132,7 @@
 msgstr "Cheie"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4137,45 +4145,45 @@
 msgstr "Valoare"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr ""
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4195,8 +4203,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4235,5 +4243,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4337,83 +4345,83 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "Straturi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "Deschide o listă cu toate straturile încărcate."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "Şterge stratul selectat."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "Arată/Ascunde"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "Comută starea vizibilă a stratului selectat."
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "Mută stratul selectat un rând în sus."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "Mută stratul selectat un rând în jos."
@@ -4423,6 +4431,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4431,22 +4439,22 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<diferit>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "Schimb valorile?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4454,5 +4462,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4461,41 +4469,41 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "Vă rog selectaţi o cheie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "Vă rog selectaţi o valoare"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 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/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr ""
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4512,39 +4520,39 @@
 msgstr "Adaugă"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 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/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 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/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "Şterge cheia selectată din toate obiectele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr ""
@@ -4556,5 +4564,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr ""
@@ -4586,31 +4594,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "Selecţia curentă"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "Deschide o fereastra cu o listă de selecţie."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "Reîncarcă lista de selecţii"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4618,5 +4626,5 @@
 msgstr "Selecţie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4625,5 +4633,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4632,5 +4640,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -4922,5 +4930,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5159,5 +5167,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr ""
@@ -5204,21 +5212,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr ""
@@ -6018,72 +6026,508 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "Nume"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr "Imagini pentru {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Nu există timp pentru punctul {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Nu pot citi timpul \"{0}\" din punctul {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr "Nu am găsit imagini cu mărci de timp citibile."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "Citesc {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr "Imagini geoetichetate"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr "Start GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr "Sfârşit GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr "diferentă curentă: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr "diferenţă zonă de timp: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "imagine"
+msgstr[1] "imagini"
+msgstr[2] "de imagini"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} în urmă."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "Sincronizare ceas"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "Imagine JPEG (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Datele din fişierul \"{0}\" nu au putut fi interpretate."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Nu există timp EXIF în fişierul \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "Imagine"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Introduceţi data afişată (ll/zz/aaaa HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr "Sincronizare timp cu unitatea GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr "Timpul introdus nu a putut fi interpretat."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr "punct gps"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "Personalizează trasarea liniilor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr "Utilizează opţiunile globale."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr "Trasează linii între puncte pentru acest strat."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr "Nu trasa linii între puncte pentru acest strat."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr "Selectaţi opţiunile pentru trasarea liniilor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "Personalizează culoarea"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Implicit"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Alegeţi o culoare"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "Importă imagini"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "Converteşte la strat de date"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} constă în:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} şters.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6092,7 +6536,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6102,441 +6546,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "Nume"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr "Imagini pentru {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Nu există timp pentru punctul {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Nu pot citi timpul \"{0}\" din punctul {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr "Nu am găsit imagini cu mărci de timp citibile."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Citesc {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr "Imagini geoetichetate"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr "Start GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr "Sfârşit GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr "diferentă curentă: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr "diferenţă zonă de timp: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "imagine"
-msgstr[1] "imagini"
-msgstr[2] "de imagini"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} în urmă."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "Sincronizare ceas"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "Imagine JPEG (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Datele din fişierul \"{0}\" nu au putut fi interpretate."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Nu există timp EXIF în fişierul \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "Imagine"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Introduceţi data afişată (ll/zz/aaaa HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr "Sincronizare timp cu unitatea GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr "Timpul introdus nu a putut fi interpretat."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr "punct gps"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "Personalizează trasarea liniilor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "Utilizează opţiunile globale."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr "Trasează linii între puncte pentru acest strat."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr "Nu trasa linii între puncte pentru acest strat."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr "Selectaţi opţiunile pentru trasarea liniilor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "Personalizează culoarea"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Implicit"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Alegeţi o culoare"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "Importă imagini"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "Converteşte la strat de date"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} constă în:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} şters.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -6911,5 +6919,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr ""
@@ -6926,16 +6934,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr ""
@@ -6963,14 +6973,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr ""
@@ -7179,19 +7192,19 @@
 msgstr "Limbă"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr ""
@@ -7322,37 +7335,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Parolă de autentificare pentru contul OSM. Lăsaţi gol pentru a nu păstra "
-"nici o parolă."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "Adresă server principal"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "Parola OSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -7702,7 +7689,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "Nu am putut citi \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -7803,7 +7790,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "Gazdă necunoscută"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -7961,22 +7948,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "Parolă sau nume utilizator incorecte."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Atenţie: Parola este transferată necriptată."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "Salvează nume utilizator şi parolă (necriptate)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "Introduceţi parola"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr ""
+"Parolă de autentificare pentru contul OSM. Lăsaţi gol pentru a nu păstra "
+"nici o parolă."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "Parola OSM"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
 
@@ -8140,14 +8153,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid "Unknown relation member type {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr ""
@@ -8569,5 +8582,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr ""
@@ -8968,5 +8981,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr ""
@@ -9291,5 +9304,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -9825,7 +9838,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr ""
@@ -9998,7 +10011,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "nici unul"
+msgstr ""
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10553,7 +10565,7 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0} punct"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -10691,5 +10703,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr ""
@@ -11498,7 +11510,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr ""
@@ -11512,5 +11524,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr ""
@@ -11743,7 +11755,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "Vă rog selectaţi rândul care va fi editat."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
@@ -11760,7 +11771,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "Nu sunt schimbări de transmis."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -11771,61 +11781,61 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr ""
@@ -12153,4 +12163,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12187,5 +12199,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr ""
@@ -12196,5 +12208,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr ""
@@ -12203,5 +12215,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr ""
@@ -12228,8 +12240,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr ""
@@ -12270,21 +12282,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr "Strat"
@@ -12298,8 +12310,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr ""
@@ -12317,15 +12329,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -12362,16 +12374,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr ""
@@ -12413,19 +12425,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr ""
@@ -12461,19 +12473,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr ""
@@ -12507,18 +12519,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr ""
@@ -12552,18 +12564,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr ""
@@ -12571,5 +12583,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr ""
@@ -12578,5 +12590,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr ""
@@ -12584,5 +12596,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr ""
@@ -12591,5 +12603,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr ""
@@ -12599,6 +12611,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr ""
@@ -12606,5 +12618,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr ""
@@ -12613,5 +12625,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr ""
@@ -12624,5 +12636,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr ""
@@ -12631,5 +12643,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr ""
@@ -12637,10 +12649,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr ""
@@ -12652,5 +12664,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr ""
@@ -12660,5 +12672,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr ""
@@ -12666,5 +12678,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr ""
@@ -12674,5 +12686,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr ""
@@ -12684,5 +12696,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr ""
@@ -12692,5 +12704,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr ""
@@ -12717,19 +12729,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr ""
@@ -12741,5 +12753,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr ""
@@ -12748,5 +12760,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr ""
@@ -12770,13 +12782,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr ""
@@ -12796,20 +12808,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr ""
@@ -12817,12 +12829,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr ""
@@ -12830,5 +12842,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr ""
@@ -12837,5 +12849,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr ""
@@ -12843,5 +12855,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr ""
@@ -12850,5 +12862,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr ""
@@ -12858,18 +12870,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr ""
@@ -12877,5 +12889,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr ""
@@ -12885,5 +12897,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -12891,5 +12903,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -12898,5 +12910,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -12905,20 +12917,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr ""
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -12931,8 +12943,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr ""
@@ -12976,23 +12988,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr ""
@@ -13005,40 +13017,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr ""
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr ""
@@ -13051,19 +13063,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr ""
@@ -13086,65 +13098,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr ""
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr ""
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -13159,10 +13171,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr ""
@@ -13178,13 +13190,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr ""
@@ -13200,30 +13212,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr ""
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr ""
@@ -13231,25 +13243,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr ""
@@ -13260,5 +13272,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr ""
@@ -13280,9 +13292,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr ""
@@ -13302,10 +13314,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr ""
@@ -13327,10 +13339,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr ""
@@ -13352,10 +13364,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr ""
@@ -13377,6 +13389,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr ""
@@ -13390,9 +13402,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr ""
@@ -13406,9 +13418,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr ""
@@ -13438,10 +13450,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr ""
@@ -13449,4 +13461,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13464,6 +13483,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr ""
@@ -13474,10 +13493,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr ""
@@ -13485,19 +13504,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr ""
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr ""
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr ""
@@ -13513,5 +13532,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr ""
@@ -13520,5 +13539,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr ""
@@ -13526,5 +13545,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr ""
@@ -13532,5 +13551,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr ""
@@ -13540,5 +13559,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr ""
@@ -13546,5 +13565,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr ""
@@ -13553,5 +13572,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr ""
@@ -13559,5 +13578,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr ""
@@ -13566,5 +13585,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr ""
@@ -13572,5 +13591,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr ""
@@ -13580,5 +13599,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr ""
@@ -13587,5 +13606,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr ""
@@ -13594,14 +13613,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr ""
@@ -13609,18 +13628,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr ""
@@ -13628,5 +13647,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr ""
@@ -13635,5 +13654,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr ""
@@ -13641,5 +13660,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr ""
@@ -13648,5 +13667,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr ""
@@ -13654,5 +13673,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr ""
@@ -13661,5 +13680,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr ""
@@ -13667,5 +13686,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr ""
@@ -13674,5 +13693,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr ""
@@ -13680,5 +13699,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr ""
@@ -13687,5 +13706,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -13694,5 +13713,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr ""
@@ -13701,13 +13720,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr ""
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr ""
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr ""
@@ -13715,5 +13734,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr ""
@@ -13723,5 +13742,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr ""
@@ -13729,5 +13748,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr ""
@@ -13737,5 +13756,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr ""
@@ -13743,5 +13762,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr ""
@@ -13751,5 +13770,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr ""
@@ -13757,5 +13776,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr ""
@@ -13765,5 +13784,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr ""
@@ -13771,5 +13790,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr ""
@@ -13779,5 +13798,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr ""
@@ -13785,5 +13804,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr ""
@@ -13793,5 +13812,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr ""
@@ -13799,10 +13818,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr ""
@@ -13810,15 +13829,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr ""
@@ -13826,5 +13845,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr ""
@@ -13859,14 +13878,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr ""
@@ -13875,5 +13894,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr ""
@@ -13883,5 +13902,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -13890,27 +13909,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr ""
@@ -13918,6 +13937,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr ""
@@ -13926,11 +13945,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -13938,30 +13957,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr ""
@@ -13969,5 +13988,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -13976,14 +13995,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr ""
@@ -13994,14 +14013,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr ""
@@ -14011,20 +14030,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr ""
@@ -14032,5 +14051,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr ""
@@ -14038,5 +14057,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr ""
@@ -14044,5 +14063,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr ""
@@ -14051,10 +14070,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr ""
@@ -14062,5 +14081,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr ""
@@ -14068,5 +14087,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -14078,7 +14097,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr ""
@@ -14086,5 +14105,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr ""
@@ -14092,5 +14111,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr ""
@@ -14098,5 +14117,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr ""
@@ -14135,18 +14154,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr ""
@@ -14155,5 +14178,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr ""
@@ -14161,5 +14184,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr ""
@@ -14167,10 +14190,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr ""
@@ -14178,15 +14201,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr ""
@@ -14194,5 +14217,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr ""
@@ -14200,10 +14223,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr ""
@@ -14213,5 +14236,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr ""
@@ -14220,5 +14243,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr ""
@@ -14227,5 +14250,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr ""
@@ -14233,5 +14256,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr ""
@@ -14240,5 +14263,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr ""
@@ -14250,15 +14273,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr ""
@@ -14266,50 +14289,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr ""
@@ -14317,15 +14340,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+msgid "Turnstile"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1018
+msgid "Edit Turnstile"
+msgstr ""
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr ""
@@ -14336,10 +14369,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr ""
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr ""
@@ -14347,5 +14380,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr ""
@@ -14353,5 +14386,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr ""
@@ -14359,10 +14392,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr ""
@@ -14370,10 +14403,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr ""
@@ -14381,10 +14414,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr ""
@@ -14394,5 +14427,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr ""
@@ -14400,15 +14433,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr ""
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr ""
@@ -14416,15 +14449,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr ""
@@ -14432,15 +14465,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -14448,5 +14481,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr ""
@@ -14455,10 +14488,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr ""
@@ -14469,14 +14502,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr ""
@@ -14490,35 +14523,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr ""
@@ -14526,20 +14559,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr ""
@@ -14547,10 +14580,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr ""
@@ -14558,5 +14591,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr ""
@@ -14564,5 +14597,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr ""
@@ -14570,5 +14603,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr ""
@@ -14577,5 +14610,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr ""
@@ -14583,10 +14616,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr ""
@@ -14594,5 +14627,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr ""
@@ -14600,5 +14633,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr ""
@@ -14606,15 +14639,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr ""
@@ -14623,5 +14656,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr ""
@@ -14629,20 +14662,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr ""
@@ -14651,15 +14684,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr ""
@@ -14667,10 +14700,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr ""
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr ""
@@ -14678,10 +14711,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr ""
@@ -14691,5 +14724,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr ""
@@ -14697,10 +14730,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr ""
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr ""
@@ -14708,5 +14741,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr ""
@@ -14736,8 +14769,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr ""
@@ -14751,35 +14784,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr ""
@@ -14787,45 +14820,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr ""
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr ""
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr ""
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr ""
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr ""
@@ -14833,5 +14866,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -14840,14 +14873,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr ""
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr ""
@@ -14856,5 +14889,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr ""
@@ -14863,5 +14896,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr ""
@@ -14871,5 +14904,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr ""
@@ -14877,5 +14910,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr ""
@@ -14884,10 +14917,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr ""
@@ -14895,10 +14928,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr ""
@@ -14906,10 +14939,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr ""
@@ -14917,10 +14950,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr ""
@@ -14928,5 +14961,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr ""
@@ -14934,5 +14967,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr ""
@@ -14943,10 +14976,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr ""
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr ""
@@ -14956,5 +14989,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr ""
@@ -14970,5 +15003,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -14978,5 +15011,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr ""
@@ -14984,41 +15017,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr ""
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr ""
@@ -15026,5 +15059,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr ""
@@ -15032,15 +15065,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr ""
@@ -15048,5 +15081,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr ""
@@ -15055,10 +15088,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr ""
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr ""
@@ -15066,5 +15099,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr ""
@@ -15072,5 +15105,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr ""
@@ -15079,5 +15112,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr ""
@@ -15086,15 +15119,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr ""
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr ""
@@ -15102,5 +15135,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr ""
@@ -15108,5 +15141,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr ""
@@ -15114,5 +15147,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr ""
@@ -15121,5 +15154,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr ""
@@ -15127,5 +15160,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr ""
@@ -15134,5 +15167,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr ""
@@ -15144,5 +15177,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr ""
@@ -15150,10 +15183,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr ""
@@ -15162,10 +15195,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr ""
@@ -15174,5 +15207,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr ""
@@ -15181,5 +15214,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr ""
@@ -15187,5 +15220,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr ""
@@ -15195,5 +15228,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr ""
@@ -15204,6 +15237,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr ""
@@ -15211,10 +15244,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr ""
@@ -15222,5 +15255,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr ""
@@ -15228,5 +15261,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr ""
@@ -15234,5 +15267,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr ""
@@ -15240,15 +15273,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr ""
@@ -15257,5 +15290,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr ""
@@ -15267,5 +15300,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -15274,15 +15307,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr ""
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr ""
@@ -15290,20 +15323,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr ""
@@ -15311,10 +15344,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr ""
@@ -15322,30 +15355,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr ""
@@ -15353,10 +15386,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr ""
@@ -15367,5 +15400,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr ""
@@ -15373,5 +15406,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr ""
@@ -15379,5 +15412,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr ""
@@ -15385,61 +15418,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr ""
@@ -15447,9 +15480,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr ""
@@ -15457,10 +15490,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr ""
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr ""
@@ -15468,20 +15501,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr ""
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr ""
@@ -15489,10 +15522,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr ""
@@ -15500,20 +15533,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr ""
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr ""
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr ""
@@ -15522,11 +15555,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr ""
@@ -15534,10 +15567,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr ""
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr ""
@@ -15546,10 +15579,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr ""
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr ""
@@ -15557,25 +15590,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr ""
@@ -15583,5 +15616,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr ""
@@ -15589,5 +15622,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr ""
@@ -15595,80 +15628,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr ""
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr ""
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr ""
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr ""
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr ""
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr ""
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
+msgid "Closer Description"
+msgstr ""
+
+#. item "Tourism/Map" text "Closer Description"
+#: build/trans_presets.java:1701
+msgid "Information Board"
+msgstr ""
+
+#. item "Tourism/Information Board" text "Name"
+#: build/trans_presets.java:1705
+msgid "Board Type"
+msgstr ""
+
+#. item "Tourism/Information Board" combo "Board Type"
+#: build/trans_presets.java:1705
+msgid "board"
+msgstr ""
+
+#: build/trans_presets.java:1705
+msgid "history"
+msgstr ""
+
+#: build/trans_presets.java:1705
+msgid "nature"
+msgstr ""
+
+#: build/trans_presets.java:1705
+msgid "wildlife"
+msgstr ""
+
+#. item "Tourism/Information Board" text "Closer Description"
 #: build/trans_presets.java:1708
-msgid "Closer Description"
-msgstr ""
-
-#. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
-msgid "Information Board"
-msgstr ""
-
-#. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
-msgid "Board Type"
-msgstr ""
-
-#. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
-msgid "board"
-msgstr ""
-
-#: build/trans_presets.java:1694
-msgid "history"
-msgstr ""
-
-#: build/trans_presets.java:1694
-msgid "nature"
-msgstr ""
-
-#: build/trans_presets.java:1694
-msgid "wildlife"
-msgstr ""
-
-#. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
 msgid "Guidepost (Hiking)"
 msgstr ""
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr ""
@@ -15676,25 +15709,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr ""
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr ""
@@ -15703,20 +15736,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr ""
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr ""
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr ""
@@ -15725,10 +15758,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr ""
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr ""
@@ -15736,5 +15769,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr ""
@@ -15742,15 +15775,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr ""
@@ -15758,45 +15791,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr ""
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr ""
@@ -15804,15 +15837,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr ""
@@ -15820,15 +15853,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr ""
@@ -15842,6 +15875,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr ""
@@ -15864,4 +15897,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -15922,5 +15963,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -15930,5 +15979,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16074,5 +16123,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16178,5 +16227,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16217,29 +16266,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr ""
@@ -16249,227 +16299,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr ""
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr ""
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr ""
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr ""
@@ -16508,191 +16558,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr ""
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr ""
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr ""
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr ""
@@ -16700,56 +16750,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr ""
@@ -16757,178 +16807,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr ""
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr ""
@@ -16936,5 +16986,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr ""
@@ -16942,10 +16992,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr ""
@@ -16953,10 +17003,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr ""
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr ""
@@ -16964,10 +17014,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr ""
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr ""
@@ -16976,10 +17026,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr ""
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr ""
@@ -16988,10 +17038,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr ""
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr ""
@@ -17001,10 +17051,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr ""
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr ""
@@ -17013,10 +17063,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr ""
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr ""
@@ -17024,5 +17074,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr ""
@@ -17030,15 +17080,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr ""
@@ -17046,10 +17096,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr ""
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr ""
@@ -17057,10 +17107,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr ""
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr ""
@@ -17068,5 +17118,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr ""
@@ -17074,5 +17124,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr ""
@@ -17081,10 +17131,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr ""
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr ""
@@ -17093,10 +17143,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr ""
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr ""
@@ -17104,10 +17154,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr ""
@@ -17116,10 +17166,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr ""
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr ""
@@ -17129,5 +17179,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr ""
@@ -17136,6 +17186,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr ""
@@ -17144,66 +17194,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr ""
@@ -17212,81 +17262,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr ""
@@ -17295,5 +17345,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr ""
@@ -17301,5 +17351,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr ""
@@ -17307,20 +17357,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr ""
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr ""
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr ""
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr ""
@@ -17328,5 +17378,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr ""
@@ -17335,5 +17385,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -17341,71 +17391,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr ""
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr ""
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr ""
@@ -17413,10 +17463,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr ""
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr ""
@@ -17424,10 +17474,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr ""
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr ""
@@ -17435,10 +17485,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr ""
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr ""
@@ -17448,10 +17498,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr ""
@@ -17459,10 +17509,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr ""
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr ""
@@ -17470,10 +17520,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr ""
@@ -17481,10 +17531,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr ""
@@ -17492,5 +17542,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr ""
@@ -17498,5 +17548,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr ""
@@ -17506,39 +17556,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr ""
@@ -17547,10 +17597,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr ""
@@ -17559,5 +17609,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -17565,10 +17615,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr ""
@@ -17579,5 +17629,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr ""
@@ -17585,5 +17635,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr ""
@@ -17592,25 +17642,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr ""
@@ -17618,20 +17668,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr ""
@@ -17640,5 +17690,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr ""
@@ -17646,5 +17696,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr ""
@@ -17652,5 +17702,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr ""
@@ -17658,5 +17708,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -17664,5 +17714,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr ""
@@ -17670,15 +17720,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr ""
@@ -17687,5 +17737,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr ""
@@ -17693,35 +17743,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr ""
@@ -17730,20 +17780,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr ""
@@ -17751,22 +17801,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr ""
@@ -17775,10 +17825,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr ""
@@ -17787,10 +17837,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr ""
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr ""
@@ -17798,25 +17848,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr ""
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr ""
@@ -17824,10 +17874,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr ""
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr ""
@@ -17835,10 +17885,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr ""
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr ""
@@ -17846,5 +17896,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr ""
@@ -17852,88 +17902,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr ""
@@ -17941,10 +17991,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr ""
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr ""
@@ -17952,10 +18002,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr ""
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr ""
@@ -17963,20 +18013,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr ""
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr ""
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr ""
@@ -17984,60 +18034,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr ""
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr ""
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr ""
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr ""
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr ""
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr ""
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr ""
@@ -18045,10 +18095,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr ""
@@ -18056,10 +18106,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -18067,60 +18117,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr ""
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr ""
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr ""
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr ""
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr ""
@@ -18128,10 +18178,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr ""
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr ""
@@ -18139,10 +18189,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr ""
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr ""
@@ -18150,35 +18200,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr ""
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr ""
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr ""
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr ""
@@ -18186,5 +18236,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr ""
@@ -18192,10 +18242,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr ""
@@ -18203,5 +18253,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr ""
@@ -18209,15 +18259,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr ""
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr ""
@@ -18225,20 +18275,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr ""
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr ""
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr ""
@@ -18246,5 +18296,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr ""
@@ -18252,10 +18302,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr ""
@@ -18263,10 +18313,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr ""
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr ""
@@ -18275,5 +18325,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -18282,20 +18332,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -18303,5 +18353,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr ""
@@ -18310,56 +18360,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr ""
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr ""
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr ""
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr ""
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr ""
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr ""
@@ -18367,15 +18416,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr ""
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr ""
@@ -18383,10 +18432,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr ""
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr ""
@@ -18394,25 +18443,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr ""
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr ""
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr ""
@@ -18420,5 +18469,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr ""
@@ -18426,10 +18475,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr ""
@@ -18437,5 +18486,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr ""
@@ -18443,5 +18492,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr ""
@@ -18449,10 +18498,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr ""
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr ""
@@ -18460,10 +18509,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr ""
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr ""
@@ -18471,10 +18520,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr ""
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr ""
@@ -18482,70 +18531,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr ""
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr ""
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr ""
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr ""
@@ -18554,15 +18603,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr ""
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr ""
@@ -18571,5 +18620,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr ""
@@ -18577,17 +18626,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr ""
@@ -18596,14 +18645,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -18611,25 +18660,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr ""
@@ -18637,10 +18686,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr ""
@@ -18648,5 +18697,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr ""
@@ -18654,5 +18703,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr ""
@@ -18661,45 +18710,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -18707,25 +18756,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr ""
@@ -18733,10 +18782,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr ""
@@ -18744,20 +18793,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr ""
@@ -18765,5 +18814,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -18771,15 +18820,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr ""
@@ -18787,9 +18836,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr ""
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr ""
@@ -18797,39 +18846,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr ""
@@ -18837,15 +18886,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr ""
@@ -18853,55 +18902,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr ""
@@ -18911,5 +18960,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr ""
@@ -18918,10 +18967,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr ""
@@ -18929,5 +18978,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr ""
@@ -18936,5 +18985,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -18942,34 +18991,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr ""
@@ -18978,15 +19027,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr ""
@@ -18994,5 +19043,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr ""
@@ -19001,5 +19050,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr ""
@@ -19007,5 +19056,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr ""
@@ -19077,24 +19126,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr ""
@@ -19147,20 +19196,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr ""
@@ -19174,10 +19223,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr ""
@@ -19185,26 +19234,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr ""
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+msgid "Route state"
+msgstr ""
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr ""
@@ -19213,30 +19267,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr ""
@@ -19272,6 +19326,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19287,5 +19342,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19304,5 +19367,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr ""
@@ -19396,7 +19459,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr ""
@@ -19661,15 +19724,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr ""
@@ -19711,5 +19774,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr ""
@@ -19847,4 +19910,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19856,5 +19925,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19862,5 +19931,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19897,5 +19966,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19919,11 +19988,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr ""
@@ -19947,5 +20016,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19986,5 +20055,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20022,6 +20091,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr ""
@@ -20077,7 +20146,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr ""
@@ -20130,11 +20199,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr ""
@@ -20155,5 +20232,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr ""
@@ -20167,5 +20244,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr ""
@@ -20186,5 +20263,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr ""
@@ -20198,6 +20275,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr ""
@@ -20212,5 +20289,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr ""
@@ -20224,5 +20301,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr ""
@@ -20236,5 +20313,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr ""
@@ -20262,5 +20339,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr ""
@@ -20403,5 +20480,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20428,13 +20505,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr ""
@@ -20496,7 +20573,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr ""
@@ -20519,10 +20596,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr ""
@@ -20558,7 +20635,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr ""
@@ -20603,6 +20680,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr ""
@@ -20616,5 +20693,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr ""
@@ -20636,5 +20713,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr ""
@@ -20648,5 +20725,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr ""
@@ -20654,4 +20731,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20694,7 +20778,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr ""
@@ -20711,5 +20795,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr ""
@@ -20724,5 +20808,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr ""
@@ -20737,5 +20821,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr ""
@@ -20750,5 +20834,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr ""
@@ -20763,5 +20847,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr ""
@@ -20776,5 +20860,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr ""
@@ -20797,4 +20881,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -20805,4 +20896,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -20879,10 +20978,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr ""
@@ -20896,5 +20996,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr ""
@@ -20908,5 +21008,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr ""
@@ -21034,12 +21134,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr ""
@@ -21053,5 +21153,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr ""
@@ -21123,8 +21223,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr ""
@@ -21226,10 +21326,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr ""
@@ -21249,4 +21349,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21268,4 +21375,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21589,4 +21703,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -21613,24 +21735,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr ""
@@ -21662,6 +21792,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr ""
@@ -21722,8 +21852,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr ""
@@ -22076,26 +22206,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr ""
@@ -22150,5 +22280,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22167,8 +22297,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr ""
@@ -22318,9 +22448,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr ""
@@ -22392,8 +22522,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr ""
@@ -22464,8 +22594,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr ""
@@ -22479,5 +22609,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr ""
@@ -22491,5 +22621,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr ""
@@ -22511,5 +22641,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr ""
@@ -22523,5 +22653,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr ""
@@ -22535,5 +22665,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr ""
@@ -22556,5 +22686,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr ""
@@ -22568,5 +22698,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr ""
@@ -22580,5 +22710,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr ""
@@ -22592,5 +22722,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr ""
@@ -22604,5 +22734,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr ""
@@ -22659,7 +22789,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr ""
@@ -22673,5 +22803,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr ""
@@ -22684,5 +22814,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr ""
@@ -22697,5 +22827,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr ""
@@ -22709,5 +22839,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr ""
@@ -22762,8 +22892,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr ""
@@ -22777,5 +22907,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr ""
@@ -22789,5 +22919,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr ""
@@ -22801,5 +22931,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr ""
@@ -22813,5 +22943,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr ""
@@ -22825,5 +22955,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr ""
@@ -22901,8 +23031,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr ""
@@ -22950,7 +23080,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr ""
@@ -23092,10 +23222,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr ""
@@ -23143,6 +23273,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr ""
@@ -23439,10 +23569,4 @@
 msgstr ""
 
-#~ msgid "Unknown file extension."
-#~ msgstr "Extensie fişier necunoscută."
-
-#~ msgid "Move"
-#~ msgstr "Mută"
-
 #~ msgid "Aborting..."
 #~ msgstr "Anulez..."
@@ -23512,6 +23636,12 @@
 #~ msgstr "Schimbă"
 
+#~ msgid "Move"
+#~ msgstr "Mută"
+
 #~ msgid "unnamed"
 #~ msgstr "fără nume"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Extensie fişier necunoscută."
 
 #~ msgid "Email"
Index: /applications/editors/josm/i18n/po/ru.po
===================================================================
--- /applications/editors/josm/i18n/po/ru.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/ru.po	(revision 17069)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
-"PO-Revision-Date: 2009-08-07 11:57+0000\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
+"PO-Revision-Date: 2009-08-10 13:40+0000\n"
 "Last-Translator: Minos <mxm-mmx@mail.ru>\n"
 "Language-Team: Koptev Oleg <koptev.oleg@gmail.com>\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: 2009-08-10 11:57+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
@@ -59,6 +59,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -68,5 +68,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -103,6 +103,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "Ошибка"
@@ -113,5 +113,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "Несохранённые изменения"
@@ -131,10 +131,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -151,15 +151,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -189,6 +189,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -218,5 +218,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -379,5 +379,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
 msgstr "Объединить"
@@ -461,9 +461,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -496,7 +496,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -584,37 +584,37 @@
 msgstr "{0} точек в линии {1} превышают максимально допустимое число точек {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "данные"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "слой"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "выделение"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "конфликт"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "скачанное"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Показать {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Изменить масштаб чтобы показать {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -624,30 +624,30 @@
 msgstr "Вид: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "Ничего не выделено для показа."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "Нет конфликтов чтобы их показать."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "Объединить линию"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "Объединить несколько линий в одну."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "Выделите не менее двух линий для объединения."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr "Объединить линии, входящие в разные отношения?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -657,13 +657,13 @@
 "объединить?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "Объединить в любом случае"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "Изменить направления?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -672,10 +672,10 @@
 "Линии с их текущими направлениями не объединить. Обратить некоторые линии?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "Перевернуть и объеденить"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -683,20 +683,20 @@
 msgstr "Введите значения для всех конфликтов."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Решение конфликтов"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Объединить {0} линии"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "Все линии были пустыми"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -743,6 +743,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -764,6 +764,6 @@
 msgstr "Удалить выделенные объекты."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -773,5 +773,5 @@
 msgstr "Перезаписать"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -903,7 +903,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "Экспортировать данные в GPX файл"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -919,5 +918,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -935,5 +934,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -1008,22 +1007,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "Объединить точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "Объединить точки в одну (более старую)"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "Пожалуйста, выберите как минимум две точки для объединения."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr "Объединить точки из разных отношений?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1033,9 +1032,9 @@
 "объединить?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "Объединить в любом случае"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -1043,5 +1042,5 @@
 "используется."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1301,7 +1300,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "Пересечений не найдено. Изменений сделано не было."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1920,5 +1918,5 @@
 msgstr "Ошибка в течение загрузки"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1935,5 +1933,5 @@
 "<strong>{2}</strong> что бы проигнорировать.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr "Удалённые или перемещённые примитивы"
@@ -1973,11 +1971,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2119,5 +2117,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2198,5 +2196,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Поиск объектов."
@@ -2330,5 +2328,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Поиск"
@@ -2535,5 +2533,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr "Невозможно отменить команду ''{0}'' так как отсутствует слой ''{1}''"
@@ -2576,5 +2574,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr "Удалить из связи"
@@ -2616,10 +2614,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "Объединить {0} точек"
-msgstr[1] "Объединить {0} точек"
-msgstr[2] "Объединить {0} точек"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2657,10 +2654,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "Повернуть {0} {1}"
-msgstr[1] "Повернуть {0} {1}"
-msgstr[2] "Повернуть {0} {1}"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2824,7 +2820,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "Изменить {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2834,5 +2830,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2881,5 +2877,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2913,5 +2909,5 @@
 msgstr "параметр ''{0}'' - недопустимый класс, получен ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2926,5 +2922,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "железная дорога"
@@ -2939,5 +2935,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3225,5 +3221,5 @@
 msgstr "Больше не показывать"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3234,5 +3230,5 @@
 "Проверьте в настройках URL сервера  и наличие подключения к сети Internet."
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3245,10 +3241,10 @@
 "{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr "Нарушение предварительного условия"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3256,25 +3252,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "неизвестный"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3284,9 +3280,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3295,9 +3291,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "Неожиданная ошибка"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3307,9 +3315,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "Неизвестный хост"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3322,5 +3330,5 @@
 "{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr "Примитив уже удален"
@@ -3410,10 +3418,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "Имя пользователя"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "Пароль"
@@ -3619,15 +3627,15 @@
 msgstr "(нет объекта)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "слоя нет в списке."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Слой ''{0}'' должен быть в списке слоёв"
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3681,5 +3689,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr "Мою с их"
@@ -3688,5 +3696,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr "Мою с объединённой"
@@ -3695,20 +3703,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr "Их с объединённой"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr "роль {0} не участвует в паре сравнения {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Параметры"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3718,6 +3726,6 @@
 msgstr "Тэги"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3725,6 +3733,6 @@
 msgstr "Точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3732,23 +3740,23 @@
 msgstr "Участники"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr "Нет неразрешённых конфликтов тегов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "Тэги({0} конфликтов)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr "{0} неразрешённых конфликтов тегов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr "Точки(решённые)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
@@ -3757,17 +3765,17 @@
 "узлов этого пути"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "Узлы(с конфликтами)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr "Неустранённые конфликты в списке узлов этого пути"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "Члены(разрешённые)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3777,30 +3785,30 @@
 "конфликтов в списке участников этого отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "Участники отношений(с конфликтами)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr "Неразрешённые конфликты в списке участников этого отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr "Нет актуальных конфликтов свойств"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "Свойства (с конфликтами)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr "Конфликты свойств ожидающие устранения"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "Разрешение конфликтов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
@@ -3808,44 +3816,44 @@
 "текущее значение параметра вне допустимой области: текущее значение {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr "недопустимое значение параметра \"index\". Текущее значение {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr "пункт {0} не найден в списке"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr "блокировать прокрутку"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr "Сравнить "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr "Моя версия"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr "Список элементов в моём наборе данных, то есть локальном наборе данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr "Объединённая версия"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3855,30 +3863,30 @@
 "объединении будет принято."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr "Их версия"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr "Список элементов в их наборе данных, набор данных на сервере"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr "> наверх"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr "Скопировать выделенные узлы в начало объединённого списка узлов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr "> вниз"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr "Скопировать выделенные элементы в конец объединённого списка элементов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3888,5 +3896,5 @@
 "объединённом списке элементов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3896,15 +3904,15 @@
 "объединённом списке элементов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
 "Скопировать их выделенные элементы в начало объединённого списка элементов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr ""
 "Скопировать их выделенные элементы в конец объединённого списка элементов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3914,5 +3922,5 @@
 "объединённом списке элементов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3922,21 +3930,21 @@
 "объединённом списке элементов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr "Вверх"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr "Поднять выделенные элементы на одну позицию"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr "Вниз"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr "Опустить выделенные элементы на одну позицию"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3945,28 +3953,28 @@
 msgstr "Удалить"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr "Удалить выделенные записи из объединённого списка элементов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr "Зафиксировать"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr "Зафиксировать текущий объединённый список элементов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr "Отменить фиксирование"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr ""
 "Отменить фиксирование объединённого списка элементов и начать объединение"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3976,5 +3984,5 @@
 "записи</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3985,5 +3993,5 @@
 "записей</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3993,5 +4001,5 @@
 msgstr[2] "Моя версия ({0} записей)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -4001,5 +4009,5 @@
 msgstr[2] "Объединённая версия ({0} записей)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -4009,21 +4017,21 @@
 msgstr[2] "Их версия ({0} записей)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -4033,5 +4041,5 @@
 msgstr "параметр '{0}' не должен быть null"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -4041,5 +4049,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -4047,19 +4055,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr "Узел"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -4070,19 +4078,19 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr "Связь с сервером прервана"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr "Да, восстановить их тоже"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr "Нет, отменить действие"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -4094,9 +4102,9 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr "Восстановить дополнительные узлы?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -4109,13 +4117,13 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr "Восстановить связанные примитивы?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr "Свойства в моём наборе данных, то есть локальном наборе данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -4123,90 +4131,90 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr "Свойства в их наборе данных, то есть серверном наборе данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr "Координаты:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr "Удалён:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr "Видим:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr "(отсутствует)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "удалён"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr "не удалён"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr "видим (на сервере)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr "невидим (на сервере)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr "Оставить клон локальной версии"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr "Физически удалить из локального набора данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr "Оставить мои координаты"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr "Оставить их координаты"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr "Восстановить конфликт между различными координатами"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr "Оставить моё состояние \"Удалён\""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr "Оставить их состояние \"Удалён\""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr "Восстановить конфликт между состояниями \"Удалён\""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr "Оставить моё состояние \"Видим\""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr "Да, сбросить id"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr "Нет, прервать"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4219,17 +4227,17 @@
 "присвоит<br>новое значение id.<br>Вы согласны?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr "Сбросить в 0"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr "Оставить их состояние \"Видим\""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr "Да, очистить"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4240,14 +4248,14 @@
 "данных.<br>Вы согласны?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr "Удалить из набора данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr "Восстановить конфликт между состояниями \"Видим\""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4255,21 +4263,21 @@
 msgstr "Роль"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr "Примитив"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4277,14 +4285,14 @@
 msgstr "<не определено>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr "Объединённый набор данных не будет содержать тег с ключом {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4292,7 +4300,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4304,7 +4312,7 @@
 msgstr "Ключ"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4317,45 +4325,45 @@
 msgstr "Значение"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr "Не могу принять неопределённое объединение тегов"
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr "Параметр 'col' должен быть 0 или 1. Текущее значение {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr "Моя версия (локальный набор данных)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr "Их версия (серверный набор данных)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ">"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Оставить выделенные пары ключ/значение из локального набора данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr "Оставить выделенных пары ключ/значение из серверного набора данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr "Восстановить конфликт"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr "Пометить выделенные теги как нерешённые"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4375,8 +4383,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4413,5 +4421,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4515,83 +4523,83 @@
 msgstr "Показать историю выделенного примитива"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "Слои"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "Показать список всех загруженных слоёв."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "Удалить выбранный слой."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr "Удалить слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr "Вы действительно хотите удалить слой ''{0}''?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr "Подтверждение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr "Да"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr "Нет"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr "Удалить всё"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "Показать/скрыть"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "Показать/скрыть выбранный слой"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "Переместить выделенный слой вверх."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "Переместить выделенный слой вниз."
@@ -4601,6 +4609,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4610,22 +4618,22 @@
 msgstr[2] "Это изменит до {0} объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "Пустое значение удаляет ключ."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<различные>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "Изменить значения?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4633,5 +4641,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4641,40 +4649,40 @@
 msgstr[2] "Изменить параметры {0} объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "Пожалуйста, выберите ключ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "Выберите значение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 msgid "Please select the objects you want to change properties for."
 msgstr "Выберите объекты, для которых вы желаете изменить параметры."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "Параметры/отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "Параметры выделенных объектов."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "Член группы"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "Добавить параметры"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4691,39 +4699,39 @@
 msgstr "Добавить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 msgid "Add a new key/value pair to all objects"
 msgstr "Добавить новую пару ключ/значение для всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "Изменить параметры"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 msgid "Edit the value of the selected key for all objects"
 msgstr "Изменить значение выбранного ключа для всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Свойств: {0} / Входит в отношения: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "Параметры / отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "Изменить отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Удалить выделение из отношения {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "Удалить выбранный ключ из всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "Удалить параметры"
@@ -4735,5 +4743,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "Отношения"
@@ -4765,31 +4773,31 @@
 msgstr "Создать копию этих отношений и открыть их в другом окне"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "Текущее выделение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "Показать окно со списком выбранных объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "Масштаб по выбранным объектам"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "Обновить список выбранного."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "Масштаб по выделению"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Отн.:{0} / Путей:{1} / Точек:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4797,5 +4805,5 @@
 msgstr "выделение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4805,5 +4813,5 @@
 msgstr[2] "{0} линий"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4813,5 +4821,5 @@
 msgstr[2] "{0} отношений"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5031,7 +5039,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "Удалить выбранное отношение"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -5114,5 +5121,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5356,5 +5363,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "Места"
@@ -5401,21 +5408,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "тип"
@@ -6215,72 +6222,522 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "Название"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+"<html>Версия <strong>{0}</strong> дата создания: <strong>{1}</strong> автор: "
+"<strong>{2}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr "Версия {0} дата создания: {1} автор: {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr "Версия"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr "Изображения для {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr "Прочесть GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Нет указания времени для точки {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Невозможно прочесть время \"{0}\" у точки  {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr "Не найдено изображений с информацией о времени."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "Чтение {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr "Изображения с данными о местоположении"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr "Начало GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr "Конец GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr "текущая разница: {0} с."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr "разница в часовых поясах: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "изображение"
+msgstr[1] "изображения"
+msgstr[2] "изображений"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} в пределах трека"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "Синхронизация часов"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "Изображения JPEG (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Невозможно прочесть дату из файла \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "EXIF файла \"{0}\" не содержит информации о времени."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "Изображение"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Введите указанную дату (мм/дд/гггг ЧЧ:MM:СС)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr "Часовой пояс GPS объекта (отличается от фотографии)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr "Синхронизировать время с GPS приёмником"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr "Введённое время невозможно использовать"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr "точка GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "Настроить отрисовку линий"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr "Использовать глобальные настройки."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr "Отображать линии между точками для этого слоя."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr "Не отображать линии между точками для этого слоя."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr "Выбрать варианты отрисовки линий"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "Выбрать цвет"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "По умолчанию"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Выбор цвета"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr "Маркеры из именованых точек"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Назвать маршрутные точки из {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "Импортировать аудиофайлы"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr "Аудиофайлы Wave (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Аудиомаркеры из {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "Импорт изображений"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} дорожка, "
+msgstr[1] "{0} дорожки, "
+msgstr[2] "{0} дорожек, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} маршрут, "
+msgstr[1] "{0} маршрута, "
+msgstr[2] "{0} маршрутов, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} путевая точка"
+msgstr[1] "{0} путевые точки"
+msgstr[2] "{0} путевых точек"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr "Название: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr "Описание: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr "Временной интервал: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr "Длина: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "Преобразовать в слой данных"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+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>Если хотите загрузить трэк, сделайте это по ссылке:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Преобразовано из: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr "Скачать с JSM данные вдоль трэка"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr "Скачать всё в пределах:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr "{0} метров"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr "Максимальная область для одного запроса:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} кв. км."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Это действие потребует {0} отдельных<br>запросов на скачивание. "
+"Продолжить?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr "На слое отсутствует трек GPX, чтобы наложить звук."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"Некоторые маршрутные точки созданы до начала трека или после его окончания и "
+"будут пропущены или перенесены в начало трека."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Нектоторые точки, которые были слишком далеко от остальных, чтобы рассчитать "
+"их время, были проигнорированы."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Слой данных {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr "вне области для скачивания"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr "версия {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+"Внимание: совместное использование данных версий 0.6 и 0.5 в версии 0.5"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} состоит из:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} удалено)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr "отключено"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr "Версия API: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr "Преобразовать в слой GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6289,7 +6746,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6299,455 +6756,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "Название"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-"<html>Версия <strong>{0}</strong> дата создания: <strong>{1}</strong> автор: "
-"<strong>{2}</strong></html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr "Версия {0} дата создания: {1} автор: {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr "Версия"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr "Изображения для {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr "Прочесть GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Нет указания времени для точки {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Невозможно прочесть время \"{0}\" у точки  {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr "Не найдено изображений с информацией о времени."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Чтение {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr "Изображения с данными о местоположении"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr "Начало GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr "Конец GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr "текущая разница: {0} с."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr "разница в часовых поясах: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "изображение"
-msgstr[1] "изображения"
-msgstr[2] "изображений"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} в пределах трека"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "Синхронизация часов"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "Изображения JPEG (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Невозможно прочесть дату из файла \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "EXIF файла \"{0}\" не содержит информации о времени."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "Изображение"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Введите указанную дату (мм/дд/гггг ЧЧ:MM:СС)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr "Часовой пояс GPS объекта (отличается от фотографии)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr "Синхронизировать время с GPS приёмником"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr "Введённое время невозможно использовать"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr "точка GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "Настроить отрисовку линий"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "Использовать глобальные настройки."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr "Отображать линии между точками для этого слоя."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr "Не отображать линии между точками для этого слоя."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr "Выбрать варианты отрисовки линий"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "Выбрать цвет"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "По умолчанию"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Выбор цвета"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr "Маркеры из именованых точек"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Назвать маршрутные точки из {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "Импортировать аудиофайлы"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr "Аудиофайлы Wave (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Аудиомаркеры из {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "Импорт изображений"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} дорожка, "
-msgstr[1] "{0} дорожки, "
-msgstr[2] "{0} дорожек, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} маршрут, "
-msgstr[1] "{0} маршрута, "
-msgstr[2] "{0} маршрутов, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} путевая точка"
-msgstr[1] "{0} путевые точки"
-msgstr[2] "{0} путевых точек"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr "Название: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr "Описание: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr "Временной интервал: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr "Длина: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "Преобразовать в слой данных"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-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>Если хотите загрузить трэк, сделайте это по ссылке:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Преобразовано из: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr "Скачать с JSM данные вдоль трэка"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr "Скачать всё в пределах:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr "{0} метров"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr "Максимальная область для одного запроса:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} кв. км."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Это действие потребует {0} отдельных<br>запросов на скачивание. "
-"Продолжить?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr "На слое отсутствует трек GPX, чтобы наложить звук."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-"Некоторые маршрутные точки созданы до начала трека или после его окончания и "
-"будут пропущены или перенесены в начало трека."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Нектоторые точки, которые были слишком далеко от остальных, чтобы рассчитать "
-"их время, были проигнорированы."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Слой данных {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr "вне области для скачивания"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr "версия {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-"Внимание: совместное использование данных версий 0.6 и 0.5 в версии 0.5"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} состоит из:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} удалено)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr "отключено"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr "Версия API: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr "Преобразовать в слой GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -7150,5 +7157,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "Авто"
@@ -7165,16 +7172,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "Вело"
@@ -7202,14 +7211,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "Пешком"
@@ -7431,19 +7443,19 @@
 msgstr "Язык"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr "Использовать настройки по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr "Использованный стиль"
@@ -7572,38 +7584,11 @@
 msgstr "Пароль"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Основной адрес сервера OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr "Логин (e-mail) учётной записи OSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr "Пароль учётной записи OSM. Оставьте пустым, чтобы не сохранять пароль."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "Основной адрес сервера"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr "Имя пользователя на OSM (e-mail)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "OSM пароль"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
-"<html>ВНИМАНИЕ: Пароль хранится открытым текстом в файле настроек.<br>Пароль "
-"передаётся на сервер открытым текстом составной частью URL.<br><b>Не "
-"используйте ценные Пароли.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -7975,7 +7960,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "Невозможно прочитать \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -8080,7 +8065,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "Неизвестная роль «{0}»."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8244,23 +8229,50 @@
 msgstr "bz2 файл содержит ошибки"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "Неправильный пароль или имя пользователя."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Внимание: Пароль будет передан в незашифрованном виде."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "Сохранить имя пользователя и пароль (не зашифровано)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "Введите пароль"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
 msgstr "Идентификатор пользователя"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr "Логин (e-mail) учётной записи OSM"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr "Пароль учётной записи OSM. Оставьте пустым, чтобы не сохранять пароль."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr "Имя пользователя на OSM (e-mail)"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "OSM пароль"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
+"<html>ВНИМАНИЕ: Пароль хранится открытым текстом в файле настроек.<br>Пароль "
+"передаётся на сервер открытым текстом составной частью URL.<br><b>Не "
+"используйте ценные Пароли.</b></html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -8270,7 +8282,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-msgstr "ожидался экземпляр OsmDataLayer или GpxLayer. Получен ''{0}''."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -8439,14 +8451,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "Неизвестный тип членства для «{0}»."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "Подготовка данных..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr "Неверный номер точки"
@@ -8906,5 +8918,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr "Описание"
@@ -9322,5 +9334,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr "Ошибка при загрузке файла"
@@ -9570,5 +9582,4 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
-#, fuzzy
 msgid ""
 "To enable the cadastre WMS plugin, change\n"
@@ -9576,6 +9587,4 @@
 "projection and retry"
 msgstr ""
-"Для включения кадастрового WMS плагина, измените\n"
-"в JOSM проекцию на Ламберта и перезапустите"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9669,5 +9678,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -10208,7 +10217,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr "вода"
@@ -10394,7 +10403,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "название"
+msgstr ""
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10965,12 +10973,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "старт"
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0} точка"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11112,5 +11120,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr "Название улицы"
@@ -11956,7 +11964,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr "здание"
@@ -11970,5 +11978,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr "область"
@@ -12228,17 +12236,14 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "Пожалуйста, выберите ряд для редактирования."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "Сохраниеть WMS слой"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Start adjusting"
-msgstr "Начать маршрутизацию"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
@@ -12247,7 +12252,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "Нет изменений для загрузки."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -12260,19 +12264,19 @@
 "Это может привести к неправильным координатам."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr "Автоматическое скачивание"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Автоматическое скачивание слоя WMS ({0}), в масштабе {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Скачивание слоя WMS ({0}), в масштабе {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -12281,37 +12285,37 @@
 "измените разрешение"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr "Скачать видимые квадраты"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr "Изменить разрешение"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr "Перезагрузить ошибочные фрагменты"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr "Альфа канал"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr "Сохранить слой WMS в файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr "Сохраниеть WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr "Загрузить слой WMS из файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr "Загрузить WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
@@ -12319,5 +12323,5 @@
 "Не поддерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr "Ошибка формата файла"
@@ -12696,4 +12700,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12730,5 +12736,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr "Улицы"
@@ -12739,5 +12745,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Автобан"
@@ -12746,5 +12752,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr "Править автобан"
@@ -12771,8 +12777,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr "Сноска"
@@ -12813,21 +12819,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr "Слой"
@@ -12841,8 +12847,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr "Полосы"
@@ -12860,15 +12866,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr "Макс. скорость (км/ч)"
@@ -12905,16 +12911,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr "Односторонняя"
@@ -12956,19 +12962,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Мост"
@@ -13004,19 +13010,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr "Тоннель"
@@ -13050,18 +13056,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr "Отсечь"
@@ -13095,18 +13101,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr "Насыпь"
@@ -13114,5 +13120,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr "Съезд с автобана"
@@ -13121,5 +13127,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr "Править съезд с автобана"
@@ -13127,5 +13133,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr "Автострада"
@@ -13134,5 +13140,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr "Править автостраду"
@@ -13142,6 +13148,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr "Автомагистраль"
@@ -13149,5 +13155,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr "Съезд с автострады"
@@ -13156,5 +13162,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr "Править съезд с автострады"
@@ -13167,5 +13173,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Основная"
@@ -13174,5 +13180,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr "Править основную дорогу"
@@ -13180,10 +13186,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr "Съезд с основной"
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr "Править съезд с основной"
@@ -13195,5 +13201,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Вторичная"
@@ -13203,5 +13209,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr "Править вторичную"
@@ -13209,5 +13215,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr "Третичная"
@@ -13217,5 +13223,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr "Править третичную"
@@ -13227,5 +13233,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Не классифицировано"
@@ -13235,5 +13241,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr "Править неклассифицированную дорогу"
@@ -13260,19 +13266,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr "Ширина (метры)"
@@ -13284,5 +13290,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Местного значения"
@@ -13291,5 +13297,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr "Править улицу местного значения"
@@ -13313,13 +13319,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr "Дорожное покрытие"
@@ -13339,20 +13345,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr "асфальтированная"
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr "неасфальтированная"
@@ -13360,12 +13366,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr "мостовая"
@@ -13373,5 +13379,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr "Жилая улица"
@@ -13380,5 +13386,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr "Править жилую улицу"
@@ -13386,5 +13392,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr "Служебная"
@@ -13393,5 +13399,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr "Править служебную дорогу"
@@ -13401,18 +13407,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr "Тип служебного проезда"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr "Внутридворовый проезд, переулок"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr "проезд"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr "парковочный проезд"
@@ -13420,5 +13426,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr "Проезд на парковке"
@@ -13428,5 +13434,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr "Изменить автомобильный проезд"
@@ -13434,5 +13440,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr "Дорога (тип неизвестен)"
@@ -13441,5 +13447,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr "Править дорогу неизвестного типа"
@@ -13448,20 +13454,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr "Дорожные ограничения"
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr "Править дорожные ограничения"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr "Платная"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr "Тупик"
@@ -13474,8 +13480,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr "Доступ"
@@ -13519,23 +13525,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr "да"
@@ -13548,40 +13554,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr "частный"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr "предусмотрен"
@@ -13594,19 +13600,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr "назначение"
@@ -13629,65 +13635,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr "разрешающее"
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr "сельскохозяйственное"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr "нет"
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr "Грузовик (до 3.5т)"
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Грузовик (более 3.5т)"
@@ -13702,10 +13708,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr "Лошадь"
@@ -13721,13 +13727,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr "Мотоцикл"
@@ -13743,30 +13749,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr "Автомобиль"
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr "Транспортные средства общего пользования"
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr "Моторная лодка"
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr "Лодка"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr "Мин. скорость (км/ч)"
@@ -13774,25 +13780,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr "Макс. масса (т)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr "Макс. Высота (метры)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr "Макс. Ширина (метры)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr "Макс. Длина (метры)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr "Круг"
@@ -13803,5 +13809,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr "Править перекрёсток"
@@ -13823,9 +13829,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr "Тип"
@@ -13845,10 +13851,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr "Автобан"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr "Съезд с автомагистрали"
@@ -13870,10 +13876,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr "Автострада"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr "Съезд с автострады"
@@ -13895,10 +13901,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr "Основная"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr "Съезд с основной"
@@ -13920,6 +13926,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr "Вторичная"
@@ -13933,9 +13939,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr "Третичная"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr "Неклассифицировано"
@@ -13949,9 +13955,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr "местного значения"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr "Жилая"
@@ -13981,10 +13987,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr "Служебная"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr "Автобусная дорога"
@@ -13992,4 +13998,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -14007,6 +14020,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr "Строительство"
@@ -14017,10 +14030,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr "Править мост"
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr "Редактировать Тоннель"
@@ -14028,19 +14041,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr "Дороги"
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr "Строительство"
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr "Править дорогу, на которой ведётся строительство"
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr "Перекрёсток"
@@ -14056,5 +14069,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr "Круг"
@@ -14063,5 +14076,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr "Дорога для всадников"
@@ -14069,5 +14082,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr "Редактировать дорогу для всадников"
@@ -14075,5 +14088,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr "Велодорожка"
@@ -14083,5 +14096,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr "Править велодорожку"
@@ -14089,5 +14102,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr "Тротуар"
@@ -14096,5 +14109,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr "Править тротуар"
@@ -14102,5 +14115,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr "Пешеходная"
@@ -14109,5 +14122,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr "Править пешеходную улицу"
@@ -14115,5 +14128,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr "Лестница"
@@ -14123,5 +14136,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr "Править лестницу"
@@ -14130,5 +14143,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr "Грунтовка"
@@ -14137,14 +14150,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr "Править грунтовку"
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr "бетон"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr "гравий"
@@ -14152,18 +14165,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr "грунт"
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr "трава"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr "песок"
@@ -14171,5 +14184,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr "Грунтовка 1 класса"
@@ -14178,5 +14191,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr "Править грунтовку 1 класса"
@@ -14184,5 +14197,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr "Грунтовка 2 класса"
@@ -14191,5 +14204,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr "Править грунтовку 2 класса"
@@ -14197,5 +14210,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr "Грунтовка 3 класса"
@@ -14204,5 +14217,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr "Править грунтовку 3 класса"
@@ -14210,5 +14223,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr "Грунтовка 4 класса"
@@ -14217,5 +14230,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr "Править грунтовку 4 класса"
@@ -14223,5 +14236,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr "Грунтовка 5 класса"
@@ -14230,5 +14243,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr "Править грунтовку 5 класса"
@@ -14237,5 +14250,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr "Тропа"
@@ -14244,13 +14257,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr "Править тропу"
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr "Снегоход"
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr "Лыжи"
@@ -14258,5 +14271,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr "Туризм"
@@ -14266,5 +14279,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr "Править туризм"
@@ -14272,5 +14285,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr "Горный туризм"
@@ -14280,5 +14293,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr "Править горный туризм"
@@ -14286,5 +14299,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr "Продвинутый горный туризм"
@@ -14294,5 +14307,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Править продвинутый горный туризм"
@@ -14300,5 +14313,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr "Альпийский туризм"
@@ -14308,5 +14321,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr "Править альпийский туризм"
@@ -14314,5 +14327,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr "Продвинутый альпийский туризм"
@@ -14322,5 +14335,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Править продвинутый альпийский туризм"
@@ -14328,5 +14341,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr "Сложный альпийский туризм"
@@ -14336,5 +14349,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Править сложный альпийский туризм"
@@ -14342,10 +14355,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr "Путевые точки"
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr "Развязка Автобана"
@@ -14353,15 +14366,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr "Править развязку автобана"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr "Номер"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr "Службы"
@@ -14369,5 +14382,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr "Править службы"
@@ -14402,14 +14415,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr "Оператор"
@@ -14418,5 +14431,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr "Светофор"
@@ -14426,5 +14439,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr "Тип пешеходного перехода"
@@ -14433,27 +14446,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr "неуправляемый"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr "Светофор"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr "остров"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr "Необозначенный"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr "Пересечение с дорогой для всадников"
@@ -14461,6 +14474,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr "Пересечение с велодорожкой"
@@ -14469,11 +14482,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr "Пересекая сопутствующие"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr "Имя типа пересечения (Великобритания)"
@@ -14481,30 +14494,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr "Зебра"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr "Пеликан"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr "Тукан"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr "Тупик (птица)"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr "Пегас"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr "Тигр"
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr "Стоп"
@@ -14512,5 +14525,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr "Пешеходный переход"
@@ -14519,14 +14532,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr "Редактирование пересечения"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr "Имя типа (UK)"
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr "Мини-круг"
@@ -14537,14 +14550,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr "Направление"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr "по часовой стрелке"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr "Круг для разворота"
@@ -14554,20 +14567,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr "Граница населённого пункта"
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr "Править границу населённого пункта"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr "Второе название"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr "Автоматический радар"
@@ -14575,5 +14588,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr "Телефон первой необходимости"
@@ -14581,5 +14594,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr "Подъём"
@@ -14587,5 +14600,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr "Крутой подъём"
@@ -14594,10 +14607,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr "Брод"
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr "Править брод"
@@ -14605,5 +14618,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr "Перевал"
@@ -14611,5 +14624,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr "Править перевал"
@@ -14621,7 +14634,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr "Возвышение"
@@ -14629,5 +14642,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr "Преграды"
@@ -14635,5 +14648,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr "Столбик"
@@ -14641,5 +14654,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr "Править столбик"
@@ -14678,18 +14691,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr "Разрешено движение:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr "Преграда для велосипедов"
@@ -14698,5 +14715,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr "Бетонный блок"
@@ -14704,5 +14721,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr "Забор препятствующий выходу скота с пастбища на дорогу"
@@ -14710,10 +14727,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr "Редактировать Забор препятствующий выходу скота с пастбища на дорогу"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr "Автобусное место"
@@ -14721,15 +14738,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr "Шипы"
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr "Редактировать выступ"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr "Оплата проезда"
@@ -14737,5 +14754,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr "Править пункт оплаты проезда"
@@ -14743,10 +14760,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr "Пограничный контороль"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr "Править пограничный контороль"
@@ -14756,5 +14773,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr "Живая изгородь"
@@ -14763,5 +14780,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr "Забор"
@@ -14770,5 +14787,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr "Стена"
@@ -14776,5 +14793,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr "Городская стена"
@@ -14783,5 +14800,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr "Подпорная стена"
@@ -14793,15 +14810,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr "Вход"
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr "Править вход"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr "Ворота"
@@ -14809,50 +14826,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr "Править ворота"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr "Шлагбаум"
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr "Править шлагбаум"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr "Ворота Гэмпшир"
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr "Редактировать Ворота Гэмпшир"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr "Портовые ворота"
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr "Редактировать Портовые ворота"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr "Узкая калитка"
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr "Редактировать Узкая калитка"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr "ступеньки для перехода через ограждение"
@@ -14860,15 +14877,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr "Редактировать ступеньки для перехода через ограждение"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+#, fuzzy
+msgid "Turnstile"
+msgstr "Поворотный стол"
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "Редактировать ступеньки для перехода через ограждение"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr "Двойные ворота"
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr "Править двойные ворота"
@@ -14879,10 +14908,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr "Вода"
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr "Источник"
@@ -14890,5 +14919,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr "Править источник"
@@ -14896,5 +14925,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr "Водосток"
@@ -14902,10 +14931,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr "Править водосток"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr "Ручей"
@@ -14913,10 +14942,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr "Править ручей"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr "Канал"
@@ -14924,10 +14953,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr "Править канал"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr "Река"
@@ -14937,5 +14966,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr "Править реку"
@@ -14943,15 +14972,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr "Править воду"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr "Суша"
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr "Править сушу"
@@ -14959,15 +14988,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr "Бассейн"
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr "Править резервуар"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr "Резервуар"
@@ -14975,15 +15004,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr "Править резервуар"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr "Крытый резервуар"
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr "Править крытый резервуар"
@@ -14991,5 +15020,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr "Берег реки"
@@ -14998,10 +15027,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr "Править берег реки"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr "Заболоченная территория"
@@ -15012,14 +15041,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr "Редактировать заболоченная территория"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr "болото"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr "трясина"
@@ -15033,35 +15062,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr "Болото"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr "плавни"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr "солевое болото"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr "ватты"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr "мангры"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr "Грязь"
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr "Править грязь"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr "Пляж"
@@ -15069,20 +15098,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr "Править пляж"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr "Бухта"
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr "Править бухту"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr "Скала"
@@ -15090,10 +15119,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr "Править скалу"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr "Побережье"
@@ -15101,5 +15130,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr "Править побережье"
@@ -15107,5 +15136,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr "Паромная переправа"
@@ -15113,5 +15142,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr "Править переправу"
@@ -15120,5 +15149,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr "Лодочная мастерская"
@@ -15126,10 +15155,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr "Править лодочную мастерскую"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr "Причал"
@@ -15137,5 +15166,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr "Править причал"
@@ -15143,5 +15172,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr "Дамба"
@@ -15149,15 +15178,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr "Править дамбу"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr "Гидротехнические сооружения"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr "Ворота шлюза"
@@ -15166,5 +15195,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr "Водослив"
@@ -15172,20 +15201,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr "Править водослив"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr "Водопад"
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr "Править водопад"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr "Разворот"
@@ -15194,15 +15223,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr "Пристань для яхт"
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr "Править пристань для яхт"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr "Пирс"
@@ -15210,10 +15239,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr "Править пирс"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr "Паромная станция"
@@ -15221,10 +15250,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr "Править паромную станцию"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr "Слип"
@@ -15234,5 +15263,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr "Править слип"
@@ -15240,10 +15269,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr "Железная дорога"
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr "Железная дорога"
@@ -15251,5 +15280,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr "Править железную дорогу"
@@ -15279,8 +15308,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr "Необязательные типы"
@@ -15294,35 +15323,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr "сад"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr "запасный путь"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr "ответвление"
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr "Узкоколейка"
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr "Править узкоколейку"
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr "Монорельс"
@@ -15330,45 +15359,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr "Править монорельс"
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr "Историческая"
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr "Править историческую дорогу"
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr "Лёгкая железная дорога"
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr "Править лёгкую железную дорогу"
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr "Метрополитен"
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr "Править метрополитен"
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr "Трамвай"
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr "Править трамвай"
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr "Направляемый автобус"
@@ -15376,5 +15405,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr "Править рельсовый автобус"
@@ -15383,14 +15412,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr "Неиспользуемая"
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr "Править неиспользуемую дорогу"
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr "Заброшенная"
@@ -15399,5 +15428,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr "Переезд"
@@ -15406,5 +15435,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr "Пересечение"
@@ -15414,5 +15443,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr "Тип пересечения"
@@ -15420,5 +15449,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr "Поворотный стол"
@@ -15427,10 +15456,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr "Надземные пути"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr "Кресельная дорога"
@@ -15438,10 +15467,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr "Править кресельную дорогу"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr "Бугельный подъёмник"
@@ -15449,10 +15478,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr "Править бугельный подъёмник"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr "Канатная дорога"
@@ -15460,10 +15489,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr "Править канатную дорогу"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr "Гондола"
@@ -15471,5 +15500,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr "Редактировать Гондолу"
@@ -15477,5 +15506,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr "Станция"
@@ -15486,10 +15515,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr "Править станцию"
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr "Заправка"
@@ -15499,5 +15528,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr "Править заправку"
@@ -15513,5 +15542,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15521,5 +15550,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr "Править стоянку"
@@ -15527,41 +15556,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr "Вместимость"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr "наземная"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr "многоуровневая"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr "подземная"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr "перехватывающая"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr "Места для инвалидов"
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr "Денежный сбор"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr "Мойка"
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr "Править автомойку"
@@ -15569,5 +15598,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr "Магазин"
@@ -15575,15 +15604,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr "Править автомагазин"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr "Мастерская"
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr "Править автомастерскую"
@@ -15591,5 +15620,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr "Прокат"
@@ -15598,10 +15627,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr "Править прокат авто"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr "Совместное использование"
@@ -15609,5 +15638,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr "Править совместное использование"
@@ -15615,5 +15644,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr "Править стоянку для велосипедов"
@@ -15622,5 +15651,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr "Править прокат велосипедов"
@@ -15629,15 +15658,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr "Править веломастерскую"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "Общественный транспорт"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr "UIC-Справка"
@@ -15645,5 +15674,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr "Полустанок"
@@ -15651,5 +15680,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr "Править полустанок"
@@ -15657,5 +15686,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr "Трамвайная остановка"
@@ -15664,5 +15693,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr "Править трамвайную остановку"
@@ -15670,5 +15699,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr "Ж/Д платформа"
@@ -15677,5 +15706,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr "Править ж/д платформу"
@@ -15687,5 +15716,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr "Справка (номер платформы)"
@@ -15693,10 +15722,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr "Область"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr "Вход в метро"
@@ -15705,10 +15734,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr "Править вход в метро"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr "Кресло-каталка"
@@ -15717,5 +15746,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr "Автовокзал"
@@ -15724,5 +15753,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr "Править автовокзал"
@@ -15730,5 +15759,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr "Автобусная остановка"
@@ -15738,5 +15767,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr "Править автобусную остановку"
@@ -15747,6 +15776,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr "Навес"
@@ -15754,10 +15783,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr "Автобусная платформа"
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr "Править автобусную платформу"
@@ -15765,5 +15794,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr "Такси"
@@ -15771,5 +15800,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr "Править стоянку такси"
@@ -15777,5 +15806,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr "Аэропорт"
@@ -15783,15 +15812,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr "Редактировать Аэродром"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr "Международная ассоциация воздушного транспорта"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr "Международная организация гражданской авиации"
@@ -15800,5 +15829,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr "Проживание"
@@ -15810,5 +15839,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Гостиница"
@@ -15817,15 +15846,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr "Править гостиницу"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr "Звёзды"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr "Мотель"
@@ -15833,20 +15862,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr "Править иотель"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr "Домик для гостей"
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr "Редактировать Домик для гостей"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr "Дача/Коттедж"
@@ -15854,10 +15883,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr "Редактировать Дача/Коттедж"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr "Студенческое общежитие"
@@ -15865,30 +15894,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr "Править студенческое общежитие"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr "Альпийский шалаш"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr "Редактировать Альпийский шалаш"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr "Площадка для домов на колёсах"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr "Править площадку для домов на колёсах"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr "Кэмпинг"
@@ -15896,10 +15925,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr "Править кэмпинг"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "Питание"
@@ -15910,5 +15939,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ресторан"
@@ -15916,5 +15945,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr "Править ресторан"
@@ -15922,5 +15951,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr "Кухня"
@@ -15928,61 +15957,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr "итальянская"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr "китайская"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr "пицца"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr "бургеры"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr "греческая"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr "немецкая"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr "индийская"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr "местная"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr "кебаб"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr "турецкая"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr "азиатская"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr "тайская"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr "мексиканская"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr "японская"
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr "Фастфуд"
@@ -15990,9 +16019,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr "Правка фастфуда"
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr "Кафе"
@@ -16000,10 +16029,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr "Править кафе"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr "Бар"
@@ -16011,20 +16040,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr "Править бар"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr "Пивная"
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr "Править пивную"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr "Закусочная"
@@ -16032,10 +16061,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr "Редактировать Закусочная"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr "Ночной клуб"
@@ -16043,20 +16072,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr "Править ночной клуб"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "Туризм"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr "Достопримечательность"
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr "Править достопримечательность"
@@ -16065,11 +16094,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr "Часы работы"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "Музей"
@@ -16077,10 +16106,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr "Править музей"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "Зоопарк"
@@ -16089,10 +16118,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr "Править зоопарк"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr "Смотровая площадка"
@@ -16100,25 +16129,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr "Править смотровую площадку"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr "Каланча"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr "Парк развлечений"
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr "Править парк развлечений"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr "Рисунки"
@@ -16126,5 +16155,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr "Редактировать рисунки"
@@ -16132,5 +16161,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr "Справочное бюро"
@@ -16138,80 +16167,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr "Править справочное бюро"
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "Карта"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr "Тип карты"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr "карта"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr "карта города"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr "карта туристических маршрутов"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr "карта велодорожек"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
 msgid "Closer Description"
 msgstr "Ближайшее описание"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1701
 msgid "Information Board"
 msgstr "Информационный стенд"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Board Type"
 msgstr "Тип Инфорационного Щита"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "board"
 msgstr "доска информации"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "history"
 msgstr "история"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "nature"
 msgstr "природа"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "wildlife"
 msgstr "животный мир"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Guidepost (Hiking)"
 msgstr "Столб с указателями (туризм)"
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr "Другие Информационные точки"
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr "Править навес"
@@ -16219,25 +16248,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr "Очаг"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr "Место для пикника"
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr "Править место для пикника"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "Исторические места"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "Замок"
@@ -16246,20 +16275,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr "Править замок"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "Руины"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr "Править руины"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr "Место раскопок"
@@ -16268,10 +16297,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr "Править место раскопок"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr "Поле битвы"
@@ -16279,5 +16308,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr "Править поле битвы"
@@ -16285,15 +16314,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr "Памятник"
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr "Править памятник"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr "Мемориал"
@@ -16301,45 +16330,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr "Править мемориал"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr "Придорожный крест"
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr "Править придорожный крест"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr "Придорожная святыня"
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr "Править придорожную святыню"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "Досуг"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr "Аквапарк"
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr "Править аквапарк"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "Игровая площадка"
@@ -16347,15 +16376,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr "Править игровую площадку"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "Рыбалка"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr "Править рыбалку"
@@ -16363,15 +16392,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr "Спортивные учреждения"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "Стадион"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr "Править стадион"
@@ -16385,6 +16414,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "вид спорта:"
@@ -16407,4 +16436,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -16465,5 +16502,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16473,5 +16518,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16617,5 +16662,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16721,5 +16766,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16760,29 +16805,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr "спорт"
@@ -16792,227 +16838,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr "несколько"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr "стрельба из лука"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr "атлетика"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr "австралийский футбол"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr "бейсбол"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr "баскетбол"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr "ж/д пути"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr "изгибаться"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr "каноэ"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr "альпинизм"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr "крикет"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr "крикет_сеть"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr "крокет"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr "велоспорт"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr "собачьи бега"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr "наездник"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr "футбол"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr "гольф"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr "гимнастика"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr "хоккей"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr "лошадиные бега"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr "машина"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr "пелота"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr "производить шум"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr "рэгби"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr "стрельба"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr "скейтборд"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr "фигурное катание"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr "лыжный спорт"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "футбол"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr "плаванье"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "настольный теннис"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr "теннис"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr "Спортивный центр"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr "Править спортивный центр"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr "Спортивное поле"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr "Править спортивное поле"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr "Трек"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr "Править трек"
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr "Поле для гольфа"
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr "Править поле для гольфа"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr "Минигольф"
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr "Править минигольф"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr "Спорт"
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr "Несколько"
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr "Править несколько видов спорта"
@@ -17051,191 +17097,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr "спортивное поле"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr "спортивный центр"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr "стадион"
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr "10штырьковый"
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr "Редактировать 10 пин"
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr "Атлетика"
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr "Править атлетику"
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr "Стрельба из лука"
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr "Править стрельбу из лука"
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr "Скалолазанье"
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr "Править скалолазанье"
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr "Каноэ"
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr "Править каноэ"
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr "Велоспорт"
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr "Править велоспорт"
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr "Собачьи бега"
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr "Править собачьи бега"
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr "Наездник"
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr "Редактировать Наездник"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr "Лошадиные бега"
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr "Править лошадиные бега"
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr "Гимнастика"
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr "Править гимнастику"
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr "Моторные виды спорта"
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr "Править моторные виды спорта"
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr "Фигурное катание"
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr "Править фигурное катание"
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr "Скейтборд"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr "Править скейтборд"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr "Плавание"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr "Править плаванье"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr "Лыжный спорт"
@@ -17243,56 +17289,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr "Править лыжный сопрт"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr "Тип лыжня"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr "спуск"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr "лыжный спорт"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr "снежный городок"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr "Сложность"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr "новичок"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr "лёгкий"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr "Промежуточный"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr "улучшенный"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr "эксперт"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr "свободный"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr "Стрельба"
@@ -17300,178 +17346,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr "Править стрельбу"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr "Спорт (с мячом)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr "Футбол"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr "Править футбол"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr "Американский футбол"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr "Править американский футбол"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr "Австралийский футбол"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr "Править австралийский футбол"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr "Бейсбол"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr "Править бейсбол"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr "Править баскетбол"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr "Гольф"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr "Править гольф"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr "поле для гольфа"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr "Рубин"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr "Редактировать Рубин"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr "Стадион"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr "Редактировать Стадион"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr "Крикет"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr "Редактировать Крикет"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr "Крикет сети"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr "Редактировать Крикет сети"
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr "Крокет"
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr "Редактировать Крокет"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr "Хоккей"
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr "Править хоккей"
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr "Пелота"
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr "Редактировать Пелота"
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr "Ракетка"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr "Редактировать Ракетка"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr "Регби"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr "Править рэгби"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr "Настольный теннис"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr "Править настольный теннис"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr "Теннис"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr "Править теннис"
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "Здания"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr "Здание"
@@ -17479,5 +17525,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "Общественное здание"
@@ -17485,10 +17531,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr "Править общественное здание"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "Муниципалитет"
@@ -17496,10 +17542,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "Править здание муниципалитета"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "Посольство"
@@ -17507,10 +17553,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "Править посольство"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "Здание суда"
@@ -17519,10 +17565,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "Править здание суда"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "Тюрьма"
@@ -17531,10 +17577,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "Править тюрьму"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "Полиция/Милиция"
@@ -17544,10 +17590,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "Править полицию"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "Пожарное депо"
@@ -17556,10 +17602,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "Править пожарное депо"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "Почтовое отделение"
@@ -17567,5 +17613,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr "Править почтовое отделение"
@@ -17573,15 +17619,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr "Детский сад"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr "Править детсад"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "Школа"
@@ -17589,10 +17635,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "Править школу"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr "Университет"
@@ -17600,10 +17646,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr "Править университет"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr "Колледж"
@@ -17611,5 +17657,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr "Править колледж"
@@ -17617,5 +17663,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "Кинотеатр"
@@ -17624,10 +17670,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "Править кинотеатр"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "Библиотека"
@@ -17636,10 +17682,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "Править библиотеку"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr "Центр искусств"
@@ -17647,10 +17693,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr "Править центр искусств"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "Театр"
@@ -17659,10 +17705,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "Править театр"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr "Место поклонения"
@@ -17672,5 +17718,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr "Править место поклонения"
@@ -17679,6 +17725,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr "Религия"
@@ -17687,66 +17733,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr "Бахаи"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr "Буддизм"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr "Христианство"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr "Индуизм"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr "Джайнизм"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr "Иудаизм"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr "Мусульманство"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr "сикхизм"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr "Спиритуализм"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr "Даосизм"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr "унитарный"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr "зороастризм"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr "Конфессия"
@@ -17755,81 +17801,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr "Англиканская"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr "Баптизм"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr "Католическая"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr "Евангельская"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr "Свидетели Иеговы"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr "Лютеранство"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr "Методизм"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr "Мормон"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr "Православие"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr "пятидесятник"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr "пресвитерианин"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr "Протестантизм"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr "квакер"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr "шиизм"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr "суннизм"
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr "Адреса"
@@ -17838,5 +17884,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr "Править адреса"
@@ -17844,5 +17890,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr "Номер дома"
@@ -17850,20 +17896,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr "Название дома"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr "Название города"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "Почтовый индекс"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr "Код страны"
@@ -17871,5 +17917,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr "Интерполяция адресов"
@@ -17878,5 +17924,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr "Править интерполяцию адресов"
@@ -17884,71 +17930,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr "Схема нумерации"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr "нечётные"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr "чётные"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr "все"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr "алфавитный"
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr "Рукотворное"
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr "Цеха"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr "Править цеха"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "Башня"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "Править башню"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "Водонапорная башня"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "Править водонапорную башню"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr "Газгольдер"
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr "Править газгольдер"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "Маяк"
@@ -17956,10 +18002,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "Править маяк"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "Ветряная мельница"
@@ -17967,10 +18013,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "Править ветряную мельницу"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "Трубопровод"
@@ -17978,10 +18024,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "Править трубопровод"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr "Очистные сооружения"
@@ -17991,10 +18037,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr "Править очистные сооружения"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr "Кран"
@@ -18002,10 +18048,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr "Править кран"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr "Буй"
@@ -18013,10 +18059,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr "Править буй"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr "Точка наблюдений"
@@ -18024,10 +18070,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr "Править точку наблюдений"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr "Видеонаблюдение"
@@ -18035,5 +18081,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr "Править видеонаблюдение"
@@ -18041,5 +18087,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr "Электростанция"
@@ -18049,39 +18095,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr "Править электростанцию"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr "энергия ветра"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr "энергия воды"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr "энергия сгорания топлива"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr "атомный"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr "уголь"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr "энергия солнца"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr "газ"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr "Электроподстанция"
@@ -18090,10 +18136,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr "Править электроподстанцию"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr "Трансформаторная будка"
@@ -18102,5 +18148,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr "Править трансформатор"
@@ -18108,10 +18154,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr "электролиния"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr "Опора ЛЭП"
@@ -18122,5 +18168,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr "Править опору ЛЭП"
@@ -18128,5 +18174,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr "Линия электропередач"
@@ -18135,25 +18181,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr "Править линию электропередач"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr "Напряжение"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr "Количество кабелей"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr "Удобства"
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "Туалеты"
@@ -18161,20 +18207,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr "Справочный номер"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr "Примечание"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr "Почтовый ящик"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "Телефон"
@@ -18183,5 +18229,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr "Править телефон"
@@ -18189,5 +18235,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "Монеты"
@@ -18195,5 +18241,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr "Банкноты"
@@ -18201,5 +18247,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr "Электронные средства оплаты"
@@ -18207,5 +18253,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr "Дебитные карты"
@@ -18213,15 +18259,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "Кредитные карты"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "Телефонные карты"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr "Переработка отходов"
@@ -18230,5 +18276,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr "Править переработку отходов"
@@ -18236,35 +18282,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr "Батарейки"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr "Консервные банки"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr "Одежда"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr "Стекло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr "Бумага"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr "Металлолом"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr "Скамейка"
@@ -18273,20 +18319,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr "Охотничий стенд"
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr "Править охотничий стенд"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr "Укрытие"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr "Заблокирован"
@@ -18294,22 +18340,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr "Высота"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr "низкий"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr "средний"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr "полный"
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr "Фонтан"
@@ -18318,10 +18364,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr "Править фонтан"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "Питьевая вода"
@@ -18330,10 +18376,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "Править источник воды"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr "Детская комната"
@@ -18341,25 +18387,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr "Редактировать Детская комната"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "Магазины"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr "Супермаркет"
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr "Править супермаркет"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr "Продуктовый магазин"
@@ -18367,10 +18413,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr "Править продуктовый магазин"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr "Киоск"
@@ -18378,10 +18424,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr "Править киоск"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "Торговый автомат"
@@ -18389,5 +18435,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "Править торговый автомат"
@@ -18395,88 +18441,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "Реализуемая продукция"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr "билеты на общественный транспорт"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr "план общественного транспорта"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr "билеты на парковку"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr "еда"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "напитки"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr "сладости"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr "сигареты"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr "фотографии"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr "еда для животных"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "газеты"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "игрушки"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr "марки"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "SIM-карты"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr "телефонные ваучеры"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr "ваучеры"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr "презервативы"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr "тампоны"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr "пакеты для экскрементов"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr "Счета или карты лояльности"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "Мясная лавка"
@@ -18484,10 +18530,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "Править мясную лавку"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "Булочная"
@@ -18495,10 +18541,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "Править булочную"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr "Флорист"
@@ -18506,20 +18552,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr "Редактировать флориста"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr "Цветочный"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr "Редактировать Цветочный Магазин"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr "Алкоголь"
@@ -18527,60 +18573,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr "Редактировать магазин алкогольной продукции"
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr "Напитки"
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr "Редактировать магазин напитков"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr "Компьютер"
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr "Редактировать магазин компьютеров"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr "Электроника"
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr "Редактиновать Магазан электрнонной техники"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr "Звуковая аппаратура"
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr "Редактировать Магазин звуковой аппаратуры"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr "Мебельный"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr "Править мебельный магазин"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr "Садовый магазин"
@@ -18588,10 +18634,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr "Редактировать Садовый магазин"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr "Оборудование"
@@ -18599,10 +18645,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr "Редактировать Магазин оборудования"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr "Строительный магазин"
@@ -18610,60 +18656,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr "Править строительный магазин"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr "Канцтовары"
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr "Редактировать Магазин Канцтоваров"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr "Парикмахерская"
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr "Править парихмахерскую"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr "Обувь"
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr "Редактировать обувной магазин"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr "Игрушки"
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr "Редактировать магазин игрушек"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr "Видео"
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr "Редактировать Магазин видеозаписей"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "Химчистка"
@@ -18671,10 +18717,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "Править химчистку"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "Прачечная"
@@ -18682,10 +18728,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "Править прачечную"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr "Товары для активного отдыха"
@@ -18693,35 +18739,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr "Править магазин товаров для активного отдыха"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr "Спорт"
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr "Редактировать Спортивный магазин"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr "Оптик"
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr "Править оптику"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "Наличные"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "Банк"
@@ -18729,5 +18775,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "Править банк"
@@ -18735,10 +18781,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "Банкомат"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr "Обмен валют"
@@ -18746,5 +18792,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr "Править обмен валют"
@@ -18752,15 +18798,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "Править банкомат"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "Здоровье"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr "Врач"
@@ -18768,20 +18814,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr "Править врача"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr "Стоматолог"
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr "Править стоматологию"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "Аптека"
@@ -18789,5 +18835,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "Править аптеку"
@@ -18795,10 +18841,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr "Отпуск лекарств по рецептам"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "Больница"
@@ -18806,10 +18852,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "Править больницу"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr "Пункт вызова экстренной помощи"
@@ -18818,5 +18864,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr "Править пункт вызова экстренной помощи"
@@ -18825,20 +18871,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr "Номер пункта"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr "Название точки"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr "Номер телефона"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Используйте международный код, как например +12-345-67890)"
@@ -18846,5 +18892,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr "Ветеринар"
@@ -18853,56 +18899,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr "Править ветеринара"
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr "Континент"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr "Править континент"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr "Страна"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr "Править страну"
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr "Штат"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr "Править штат"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr "Область"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr "Править область"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr "Графство"
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr "Править графство"
@@ -18910,15 +18955,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr "Город (более 100 000)"
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr "Править город"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr "Город (до 100 000)"
@@ -18926,10 +18971,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr "Править город"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr "Пригород"
@@ -18937,25 +18982,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr "Править пригород"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "Село"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "Править село"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr "Деревня"
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr "Править деревню"
@@ -18963,5 +19008,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr "Местность"
@@ -18969,10 +19014,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr "Править местность"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "Остров"
@@ -18980,5 +19025,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "Править остров"
@@ -18986,5 +19031,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr "Вход в пещеру"
@@ -18992,10 +19037,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr "Править вход в пещеру"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "Вершина"
@@ -19003,10 +19048,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "Править вершину"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr "Ледник"
@@ -19014,10 +19059,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr "Править ледник"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr "Вулкан"
@@ -19025,70 +19070,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr "Править вулкан"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr "Границы"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr "Государственная"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr "Править государственную границу"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr "Административная"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr "Править административную границу"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr "Гражданская"
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr "Править гражданскую границу"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr "Политическая"
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr "Править политическую границу"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr "Национальный парк"
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr "Править национальный парк"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr "Землепользование"
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "Дерево"
@@ -19097,15 +19142,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "Править дерево"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr "Научное название"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr "Лесистая местность"
@@ -19114,5 +19159,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr "Править лесистую местность"
@@ -19120,17 +19165,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr "Хвойный"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr "Лиственный"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr "Смешанный"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "Лес"
@@ -19139,14 +19184,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr "Править лес"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr "Заповедник"
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr "Править заповедник"
@@ -19154,25 +19199,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr "Каменистая осыпь"
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr "Редактировать Каменистая осыпь"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr "Кустарник"
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr "Редактировать Кустарник"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr "Вырубленный лес"
@@ -19180,10 +19225,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr "Редактировать Вырубленный лес"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr "Пустошь"
@@ -19191,5 +19236,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr "Редактировать Здоровье"
@@ -19197,5 +19242,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr "Двор фермы"
@@ -19204,45 +19249,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr "Править двор фермы"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr "Обрабатываемая земля"
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr "Править обрабатываемую землю"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr "Луг"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr "Редактировать Луг"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr "Виноградник"
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr "Править виноградник"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr "Огороды"
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr "Править огороды"
@@ -19250,25 +19295,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr "Сад"
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr "Править сад"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr "Трава"
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr "Править траву"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr "Село"
@@ -19276,10 +19321,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr "Редактировать Село"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr "Общее"
@@ -19287,20 +19332,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr "Править общее"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr "Парк"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr "Править парк"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr "Спортплощадка"
@@ -19308,5 +19353,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr "Править спортплощадку"
@@ -19314,15 +19359,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr "Жилая зона"
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr "Править жилую зону"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr "Церковное кладбище"
@@ -19330,9 +19375,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr "Править церковное кладбище"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr "Кладбище"
@@ -19340,39 +19385,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr "Править кладбище"
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr "Розничная торговля"
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr "Править розничную торговлю"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr "Коммерция"
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr "Править коммерцию"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr "Промышленность"
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr "Править промышленность"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr "Железная дорога"
@@ -19380,15 +19425,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr "Править ж/д пути"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr "Военное"
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr "Править военное"
@@ -19396,55 +19441,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr "Стройплощадка"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr "Править стройплощадку"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr "Пустырь с развалинами"
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr "Править пустырь с развалинами"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr "Пустырь"
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr "Править пустырь"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr "Свалка"
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr "Править свалку"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr "Карьер"
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr "Править карьер"
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr "Мультиполигональное"
@@ -19454,5 +19499,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr "Править мультиполигональное отношение"
@@ -19461,10 +19506,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr "внешний сегмент"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr "внутренний сегмент"
@@ -19472,5 +19517,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr "Ограничение на поворот"
@@ -19479,5 +19524,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr "Править ограничение на поворот"
@@ -19485,34 +19530,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr "Ограничение"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr "поворот налево запрещён"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr "поворот направо запрещён"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr "движение прямо запрещено"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr "разворот запрещён"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr "движение только направо"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr "движение только налево"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr "движение только прямо"
@@ -19521,15 +19566,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr "с улицы"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr "через точку или линию"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr "на улицу"
@@ -19537,5 +19582,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr "Маршрут"
@@ -19544,5 +19589,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr "Править маршрут"
@@ -19550,5 +19595,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr "Тип маршрута"
@@ -19620,24 +19665,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr "велосипедный"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr "автобусный"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr "трасса"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr "паромный"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr "лыжный"
@@ -19690,20 +19735,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr "пеший"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr "туристический"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr "трамвайный"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr "объездной"
@@ -19717,10 +19762,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr "метро"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr "Описание символа"
@@ -19728,26 +19773,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr "Сеть"
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "Тип маршрута"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr "планируемый"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr "альтернативный"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr "временный"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr "соединяющий"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr "Цвет (hex)"
@@ -19756,30 +19807,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr "сегмент маршрута"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr "сегмент вперёд"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr "сегмент назад"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr "конечная точка"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr "конечная вперёд"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr "конечная назад"
@@ -19815,6 +19866,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19830,5 +19882,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19847,5 +19907,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr "стандартный"
@@ -19939,7 +19999,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr "мост"
@@ -20204,15 +20264,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr "уменьшать"
@@ -20254,5 +20314,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr "лошадь"
@@ -20390,4 +20450,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20399,5 +20465,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20405,5 +20471,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20440,5 +20506,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20462,11 +20528,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr "ограждение"
@@ -20490,5 +20556,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20529,5 +20595,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20565,6 +20631,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr "улица"
@@ -20620,7 +20686,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr "шоссе"
@@ -20673,11 +20739,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr "железная дорога"
@@ -20698,5 +20772,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr "услуги"
@@ -20710,5 +20784,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr "брод"
@@ -20729,5 +20803,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr "кольцо"
@@ -20741,6 +20815,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr "пункт неотложной помощи"
@@ -20755,5 +20829,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr "берег реки"
@@ -20767,5 +20841,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr "поток"
@@ -20779,5 +20853,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr "док"
@@ -20805,5 +20879,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr "акведук"
@@ -20946,5 +21020,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20971,13 +21045,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr "искусственный"
@@ -21039,7 +21113,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr "железнодорожная станция"
@@ -21062,10 +21136,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr "другая жд дорога"
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr "жд дорога сверху"
@@ -21101,7 +21175,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr "Старая жд дорога"
@@ -21146,6 +21220,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr "воздушная трасса"
@@ -21159,5 +21233,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr "пассажирский терминал"
@@ -21179,5 +21253,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr "воздушная трасса темная"
@@ -21191,5 +21265,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr "воздушная трасса светлая"
@@ -21197,4 +21271,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21237,7 +21318,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr "воздушная трасса"
@@ -21254,5 +21335,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr "легкая трасси"
@@ -21267,5 +21348,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr "промежуточная трасса"
@@ -21280,5 +21361,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr "продвинутая трасса"
@@ -21293,5 +21374,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr "специалист лыжной трассы"
@@ -21306,5 +21387,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr "бесплатная трасса"
@@ -21319,5 +21400,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr "трасса для новичков"
@@ -21340,4 +21421,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -21348,4 +21436,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -21422,10 +21518,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr "энергия"
@@ -21439,5 +21536,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr "плотина"
@@ -21451,5 +21548,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr "трубопровод"
@@ -21577,12 +21674,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr "свободное время"
@@ -21596,5 +21693,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr "гавань"
@@ -21666,8 +21763,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr "использование"
@@ -21769,10 +21866,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr "режим использования"
@@ -21792,4 +21889,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21811,4 +21915,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -22132,4 +22243,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -22156,24 +22275,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr "легкое использование"
@@ -22205,6 +22332,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr "легкая вода"
@@ -22265,8 +22392,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr "здоровье"
@@ -22619,26 +22746,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr "Магазин"
@@ -22693,5 +22820,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22710,8 +22837,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr "отель"
@@ -22861,9 +22988,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr "туризм"
@@ -22935,8 +23062,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr "исторический"
@@ -23007,8 +23134,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr "зеленый"
@@ -23022,5 +23149,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr "карьер"
@@ -23034,5 +23161,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr "мусорная свалка"
@@ -23054,5 +23181,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr "водоём"
@@ -23066,5 +23193,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr "лес"
@@ -23078,5 +23205,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr "двор фермы"
@@ -23099,5 +23226,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr "розничная продажа"
@@ -23111,5 +23238,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr "промышленный"
@@ -23123,5 +23250,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr "заброшенная застройка"
@@ -23135,5 +23262,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr "участок для застройки"
@@ -23147,5 +23274,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr "жд разъезд"
@@ -23202,7 +23329,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr "военный"
@@ -23216,5 +23343,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr "кладбище"
@@ -23227,5 +23354,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr "пик"
@@ -23240,5 +23367,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr "ледник"
@@ -23252,5 +23379,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr "вулкан"
@@ -23305,8 +23432,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr "природный"
@@ -23320,5 +23447,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr "кустарник"
@@ -23332,5 +23459,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr "здоровье"
@@ -23344,5 +23471,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr "лес"
@@ -23356,5 +23483,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr "грязь"
@@ -23368,5 +23495,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr "пляж"
@@ -23444,8 +23571,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr "маршрут"
@@ -23493,7 +23620,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr "граница"
@@ -23635,10 +23762,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr "место"
@@ -23686,6 +23813,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr "адрес"
@@ -23985,42 +24112,33 @@
 #~ msgstr "Неизвестное расширение файла."
 
+#~ msgid "Email"
+#~ msgstr "Электронная почта"
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Соединение с OSM сервером..."
+
+#~ msgid "Aborting..."
+#~ msgstr "Прерывание..."
+
+#~ msgid "position"
+#~ msgstr "положение"
+
+#~ msgid "different"
+#~ msgstr "различный"
+
+#~ msgid "true"
+#~ msgstr "истина"
+
+#~ msgid "false"
+#~ msgstr "ложь"
+
+#~ msgid "Change"
+#~ msgstr "Изменить"
+
+#~ msgid "unnamed"
+#~ msgstr "безымянный"
+
 #~ msgid "Move"
 #~ msgstr "Переместить"
-
-#~ msgid "Invalid projection"
-#~ msgstr "Неправильная проекция"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Изменение проекции на {0} в первую очередь."
-
-#~ msgid "end"
-#~ msgstr "конец"
-
-#~ msgid "Email"
-#~ msgstr "Электронная почта"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Соединение с OSM сервером..."
-
-#~ msgid "Aborting..."
-#~ msgstr "Прерывание..."
-
-#~ msgid "position"
-#~ msgstr "положение"
-
-#~ msgid "different"
-#~ msgstr "различный"
-
-#~ msgid "true"
-#~ msgstr "истина"
-
-#~ msgid "false"
-#~ msgstr "ложь"
-
-#~ msgid "Change"
-#~ msgstr "Изменить"
-
-#~ msgid "unnamed"
-#~ msgstr "безымянный"
 
 #~ msgid "Rotate"
@@ -24261,4 +24379,7 @@
 #~ msgstr "Импортировать файл TCX..."
 
+#~ msgid "end"
+#~ msgstr "конец"
+
 #~ msgid ""
 #~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
@@ -24341,4 +24462,10 @@
 #~ "Произошла ошибка при попытке сопоставить фотографии с GPX треком. Вы "
 #~ "можете настроить вручную с помощью ползунов соответствие фотографиям."
+
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Изменение проекции на {0} в первую очередь."
+
+#~ msgid "Invalid projection"
+#~ msgstr "Неправильная проекция"
 
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
Index: /applications/editors/josm/i18n/po/sk.po
===================================================================
--- /applications/editors/josm/i18n/po/sk.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/sk.po	(revision 17069)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
-"PO-Revision-Date: 2009-08-06 19:34+0000\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
+"PO-Revision-Date: 2009-08-12 19:42+0000\n"
 "Last-Translator: Vlado <babicvm@szm.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2009-08-10 11:57+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -56,6 +56,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -100,6 +100,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "Chyba"
@@ -110,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "Neuložené zmeny"
@@ -128,10 +128,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -148,15 +148,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -186,6 +186,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -215,5 +215,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -374,5 +374,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
 msgstr "Zlúčiť"
@@ -458,9 +458,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -493,7 +493,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -580,37 +580,37 @@
 msgstr "{0} bodov v ceste {1} prekročilo max. povolené množstvo bodov {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "údaje"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "výber"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "stiahnuté"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Priblížiť na {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Priblížiť pohľad na {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -620,30 +620,30 @@
 msgstr "Zobrazenie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "Nie je zvolené nič, čo by se mohlo priblížiť."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "Nie je žiadny konflikt, čo by sa mohol priblížiť"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "Spojiť cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "Spojiť niekoľko ciet do jednej."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "Prosím, vyberte aspoň dve cesty pre spojenie."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr "Spojiť cesty patriace do rôznych vzťahov (relátion)?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -652,13 +652,13 @@
 "Zvolené cesty patria do iného vzťahu (relation). Naozaj ich chcete spojiť?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "Aj tak spojiť"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "Zmeniť smer?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -668,10 +668,10 @@
 "ciest?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "Otočiť a Spojiť"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -679,20 +679,20 @@
 msgstr "Zadajte hodnoty pre všetky konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Riešenie konfliktov"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Spojiť {0} ciest"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "Všetky cesty boli prázdne"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -739,6 +739,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -760,6 +760,6 @@
 msgstr "Zmazať zvolené objekty."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -769,5 +769,5 @@
 msgstr "Prepísať"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -899,7 +899,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "Exportovať dáta do GPX súboru."
+msgstr "Export GPX súboru"
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -915,5 +914,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -931,5 +930,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -1004,22 +1003,22 @@
 msgstr "Zlúčiť aktuálnu vrstvu do inej vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "Zlúčiť body"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "Zlúčiť body do najstaršieho bodu"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "Zvoľte minimálne dva body pre zlúčenie"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr "Zlúčiť body s rôznymi členmi ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1029,14 +1028,14 @@
 "chcete zlúčiť ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "Aj tak zlúčiť"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
 "Nemôžem zlúčiť body: Zmazala by sa tak cesta, ktorá je stále používaná."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1128,5 +1127,5 @@
 #, java-format
 msgid "<html>Could not read file ''{0}''. Error is: <br>{1}</html>"
-msgstr ""
+msgstr "<html>Nemôžem čítať súbor ''{0}''. Chyba je: <br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
@@ -1187,4 +1186,7 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 msgstr ""
+"<html>Používate EPSG:4326 projekciu ktorá môže viesť<br>k nežiadúcim "
+"výsledkom keď vytvárate pravouhlé zarovnanie.<br>Zmeňte vaše zobrazenie ak "
+"chcete odstrániť toto upozornenie.<br>Chcete pokračovať?</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
@@ -1251,4 +1253,5 @@
 msgid "Warning: failed to put a dialog always on top. Exception was: {0}"
 msgstr ""
+"Upozornenie: neúspešné umiestnenie dialóg vždy navrchu. Výnimka bola: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
@@ -1291,7 +1294,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "Nenájdený žiadny priesečník. Nič nebolo zmenené."
+msgstr "Žiadny exportér nenájdený! Nič zachránené.."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1467,4 +1469,7 @@
 "should verify this and correct it when necessary.</html>"
 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>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
@@ -1473,4 +1478,6 @@
 "this and correct it when necessary.</html>"
 msgstr ""
+"<html>Vzťah relácie bol skopírovaný do všetkých nových ciest.<br>Mali by ste "
+"toto overiť a  opraviť ak je to nutné.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
@@ -1614,9 +1621,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
 msgid "No current dataset found"
-msgstr ""
+msgstr "Nájdená neaktuálna dátová sada"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
 msgid "Didn't find a primitive with id {0} in the current dataset"
-msgstr ""
+msgstr "Neviem zistiť pôvodné s id {0} v aktuálnej dátovej sade"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
@@ -1738,5 +1745,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
 msgid "upload all changes in one request"
-msgstr ""
+msgstr "nahrať všetky zmeny v jednej požiadavke"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
@@ -1745,4 +1752,6 @@
 "changed primitive"
 msgstr ""
+"Umožniť nahranie všetkých zmien v jednej požiadavke, vypnúť použitie jednej "
+"požiadavky na zmenené pôvodné"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464
@@ -1878,5 +1887,5 @@
 msgid ""
 "Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
+msgstr "Ignorujem výnimky pretože sťahovanie bolo zrušené. Výnimka bola: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
@@ -1895,10 +1904,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
 msgid "Updating data"
-msgstr ""
+msgstr "Aktualizujem dáta"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
 #, java-format
 msgid "The following errors occurred during mass download:{0}"
-msgstr ""
+msgstr "Nastedujúca chyba nastala počas masového sťahovania:{0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
@@ -1906,5 +1915,5 @@
 msgstr "Chyby v priebehu sťahovania"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1921,5 +1930,5 @@
 "servery.<br>Click <strong>{2}</strong>ignorovať.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr "Vymazané alebo presunuté pôvodné"
@@ -1958,11 +1967,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2104,5 +2113,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2182,5 +2191,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Vyhľadávať objekty"
@@ -2188,5 +2197,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
-msgstr ""
+msgstr "Nemôžem vyhľadávať, pretože nie sú načítané dáta."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66
@@ -2311,5 +2320,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Hľadať"
@@ -2496,9 +2505,11 @@
 "conflict can't be added.</html>"
 msgstr ""
+"<html>Vrstva ''{0}'' má práve konflikt pre obecné<br>''{1}''.<br>Tento "
+"konflikt nemôže byť pridaný.</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
 msgid "Double conflict"
-msgstr ""
+msgstr "Dvojitý konflikt"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
@@ -2508,13 +2519,15 @@
 "primitmive ''{1}''"
 msgstr ""
+"Varovanie:vrstva ''{0}'' neexistuje. Nemôžem odstrániť konflikt pre pôvodné "
+"''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
 #, java-format
 msgid "Add conflict for ''{0}''"
-msgstr ""
+msgstr "Pridať konflikt pre ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr "Nemôžem zrušiť príkaz \"{0}\", pretože vrstva \"{1}\" nie je vybraná."
@@ -2557,5 +2570,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr "Zmazať z relácie (zo vzťahu"
@@ -2589,5 +2602,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Delete confirmation"
-msgstr ""
+msgstr "Odstrániť potvrdenie"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
@@ -2597,10 +2610,10 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "Zlúčiť {0} body"
-msgstr[1] "Zlúčiť {0} body"
-msgstr[2] "Zlúčiť {0} body"
+msgstr[0] "Posun {0} bodov"
+msgstr[1] "Posun {0} bodu"
+msgstr[2] "Posun {0} bodov"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2638,10 +2651,10 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "Otočiť {0} {1}"
-msgstr[1] "Otočiť {0} {1}"
-msgstr[2] "Otočiť {0} {1}"
+msgstr[0] "Otáčanie {0} bodov"
+msgstr[1] "Otáčanie {0} bodu"
+msgstr[2] "Otáčanie {0} bodov"
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2774,4 +2787,6 @@
 "{1}"
 msgstr ""
+"Neúspešné nahratie záložiek z ''{0}'' pre bezpečnostné dôvody. Výnimka bola: "
+"{1}"
 
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
@@ -2805,7 +2820,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "Zmeniť {0} {1}"
+msgstr "Zmenová sada {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2815,5 +2830,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2862,5 +2877,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2894,5 +2909,5 @@
 msgstr "parameter ''{0}''je neprijateľná trieda, dostáva ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2907,5 +2922,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "železnica"
@@ -2920,5 +2935,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3143,5 +3158,5 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
 msgid "Gauss-Laborde Réunion 1947"
-msgstr ""
+msgstr "Gauss-Laborde Réunion 1947"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111
@@ -3182,23 +3197,23 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
 msgid "UTM20N Guadeloupe Fort-Marigot 1949"
-msgstr ""
+msgstr "UTM20N Guadeloupe Fort-Marigot 1949"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
 msgid "UTM20N Guadeloupe Ste-Anne 1948"
-msgstr ""
+msgstr "UTM20N Guadeloupe Ste-Anne 1948"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
 msgid "UTM20N Martinique Fort Desaix 1952"
-msgstr ""
+msgstr "UTM20N Martinique Fort Desaix 1952"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
 #, java-format
 msgid "<html>Could not read bookmarks.<br>{0}</html>"
-msgstr ""
+msgstr "<html>Nemôžem čítať záložky.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr ""
+msgstr "<html>Nemôžem zapísať záložku.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
@@ -3206,5 +3221,5 @@
 msgstr "Nezobrazovať v budúcnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3216,5 +3231,5 @@
 "pripojenia na internet."
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3227,10 +3242,10 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr "Predpokladaný priestupok"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3238,25 +3253,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "neznámy"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3265,10 +3280,14 @@
 "applet and because you didn''t load your applet from ''{1}''.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+"<html>Neúspešné otváranie a pripájanie na  vzdialený "
+"server<br>''{0}''<br>pre bezpečnostné dôvody. Toto je veľmi pravdepodobné "
+"pretožestále bežíte<br>v nejakom applete a pretože nemôžete načítať váš "
+"applet z ''{1}''.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+msgstr "Bezpečnostná výnimka"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3276,10 +3295,24 @@
 "check your internet connection.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+"<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/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+msgstr "Sieťová výnimka"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "Neočakávaná chyba programu."
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3288,10 +3321,13 @@
 "preferences and your internet connection.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+"<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/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "Neznámy hostiteľ"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3304,5 +3340,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr "Pôvodné je už zmazané"
@@ -3312,4 +3348,6 @@
 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}"
 
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65
@@ -3393,10 +3431,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "Meno používateľa"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "Heslo"
@@ -3601,19 +3639,21 @@
 msgstr "(žiadny objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "vrstva nie je v zozname"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Vrstva ''{0}'' musí byť v  zozname vrstiev"
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
 "Warning: failed to put option pane dialog always on top. Exception was: {0}"
 msgstr ""
+"Varovanie: neúspešná voľba umiestniť panel dialógu vždy na vrchu. Výnimky "
+"boli: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63
@@ -3623,4 +3663,6 @@
 "{0}"
 msgstr ""
+"Varovanie: neúspešná voľba zobraziť ''prosím počkajte'' vždy na vrchu. "
+"Výnimky boli: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
@@ -3663,5 +3705,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr "Môj s Ich"
@@ -3670,5 +3712,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr "Môj so zlúčeným"
@@ -3677,20 +3719,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr "Ich so zlúčeným"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr "funkcia {0} sa nenachádza v porovnávenej dvojici {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3700,6 +3742,6 @@
 msgstr "Značky"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3707,6 +3749,6 @@
 msgstr "Body"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3714,23 +3756,23 @@
 msgstr "Členovia"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr "Nevyriešený konflikt značiek musí byť vyriešený"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "Značky({0} konfliktov)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr "{0} nevyriešený konflikt značiek musí byť vyriešený"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr "Body(vyriešené)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
@@ -3739,17 +3781,17 @@
 "tejto ceste."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "Body(v konflikte)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr "Nevyriešené konflikty v zozname bodov v tejto ceste"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "Členy(vyriešené)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3759,74 +3801,74 @@
 "tejto relácii"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "Členy(v konflikte)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr "Nevyriešené konflikty v zozname členov v tejto relácii"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr "Nevyriešený konflikt vo vlastnostiech"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "Vlastnosti (s konfliktmi)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr "Nebyriešený konflikty vlastností musia byť vyriešené"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "Rozhodnutie konfliktov"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr "aktuálny parameter je mimo rozsahu: got {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr "zoznam funkcií {0} sa teraz nenachádza v porovnávanej dvojici"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr "neočakávaná hodnota parametra\"index\". Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr "položka {0} sa v zozname nenachádza"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr "zablokovať rolovanie"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr "Porovnať "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr "Moja verzia"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr "Zoznam elementov v mojej dátovej sade, i.e. miestna dátová sada"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr "Spojovaná verzia"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3836,31 +3878,31 @@
 "rozhodnutie pre spojenie bude aplikované"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr "Ich verzia"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr "Zoznam elementov v ich dátovej sade, i.e. v dátovej sade servera"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr "> hore"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr "Kopírovať moje vybrané body na začiatok zoznamu pre spojované body"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr "> dole"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr ""
 "Kopírovať moje vybrané elementy na koniec zoznamu pre spojované elementy"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3870,5 +3912,5 @@
 "spojované elementy"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3878,15 +3920,15 @@
 "spojované elementy"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
 "Kopírovať ich vybrané elementy na začiatok zoznamu pre spojované elementy"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 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"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3896,5 +3938,5 @@
 "spojované elementy"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3904,21 +3946,21 @@
 "spojované elementy"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr "Hore"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr "Posunúť hore vybrané elementy s rovnakou pozíciou"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr "Dole"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr "Posunúť dole vybrané elementy s rovnakou pozíciou"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3927,27 +3969,27 @@
 msgstr "Odstrániť"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr "Odstrániť vybrané položky zo zoznamu spojovaných elementov"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr "Blokovať"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr "Blokovať aktuálny zoznam spojovaných elementov"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr "Odblokovať"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr "Odblokovať zoznam spojovaných elementov a začať spojovanie"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3957,5 +3999,5 @@
 "položiek</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3966,5 +4008,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3974,5 +4016,5 @@
 msgstr[2] "Moja verzia ({0} vstupov)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3982,5 +4024,5 @@
 msgstr[2] "Spojovaná verzia ({0} vstupov)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -3990,21 +4032,21 @@
 msgstr[2] "Ich verzia ({0} vstupov)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -4014,5 +4056,5 @@
 msgstr "parameter '{0}' nesmie byť nulový"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -4024,5 +4066,5 @@
 "nastavení synchronizácii"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -4030,19 +4072,19 @@
 msgstr "nastaviteľný {0} ešte neregistrovaný"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr "Bod"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr "Spojované body sú ešte neblokované. Nie je možné dať vykonávací povel"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr "neočakávaný index stĺpca. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -4052,19 +4094,19 @@
 "<html>Nastala chyba počas komunikácie so serverom<br>Detaily: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr "Spojenie so serverom zlyhalo"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr "Áno, obnoviť ich tiež"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr "Nie, zrušiť operáciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -4075,9 +4117,9 @@
 "servery.<br><br>Chcete obnoviť tieto body tiež?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr "Obnoviť pridané body?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -4089,13 +4131,13 @@
 "servery.<br><br>Chcete ich obnoviť tiež?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr "Obnoviť pôvodné závislé odkazy?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr "Vlastnosti v mojej dátovej sade, i.e. lokálna dátová sada"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -4105,90 +4147,90 @@
 "elementoch, keď rozhodnutie o spojenie bude aplikované."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr "Vlastnosti v ich dátovej sade, i.e. serverova dátova sada"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr "Súradnice:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr "Vymazaný stav:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr "Viditeľný Stav:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr "(žiadny)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "zmazané"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr "nevymazaný"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr "viditeľné (na servery)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr "neviditeľné (na servery)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr "Zostáva klon lokálnej verzie"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr "Fyzicky vymazať z lokálnej verzie"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr "Ponechaj moje súradnice"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr "Ponechaj ich súradnice"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr "Nerozhodnuté konflikty medzi rôznymi súradnicami"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr "Udržať môj vymazaný stav"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr "Udržať ich vymazaný stav"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr "Nevyriešené konflikty medzi vymazávaným stavom"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr "Zostáva môj viditeľný stav"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr "Áno, vynulovať id"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr "Nie, zrušiť"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4201,17 +4243,17 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr "Nastaviť id na 0"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr "Ponechať svoj viditeľný stav"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr "Áno, očistiť to"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4222,14 +4264,14 @@
 "<br>Súhlasíte?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr "Odstrániť z dátovej sady"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr "Nerozhodnutý konflikt medzi viditeľnými stavom"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4237,22 +4279,22 @@
 msgstr "Úloha"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr "Pôvodný"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 "spojované body ešte nie sú blokované. Memôžem spustiť vykonávací príkaz"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4260,14 +4302,14 @@
 msgstr "<nedefinované>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr "Spojovaná dátová sada nebude obsahovať značky s kľúčom {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4275,7 +4317,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4287,7 +4329,7 @@
 msgstr "Kĺúč"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4300,45 +4342,45 @@
 msgstr "Hodnota"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr "nie je možné použiť neistú značku pri spojovaní prvkov"
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr "Parameter 'col'  musí byť 0 alebo 1. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr "Moja verzia (miestna(local) dátova sada)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr "Ich(their) verzia (serverová dátová sada)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ">"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "Držať vybrané páry kľúče/hodnoty z miestnej(local) dátovej sady"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr "Držať vybrané páry kľúče/hodnoty z dátovej sady servera"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr "Nerozhodnuté"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr "Symbol vybraných značiek je nerozhodnutý"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4358,8 +4400,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4398,5 +4440,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4411,4 +4453,6 @@
 "Exception: {0}"
 msgstr ""
+"Varovanie: nemôžem setAlwaysOnTop(true) pre ConflictResolution Dialog. "
+"Výnimka: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
@@ -4426,5 +4470,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
 msgid "Close anyway"
-msgstr ""
+msgstr "Zavrieť akúkoľvek cestu"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
@@ -4441,8 +4485,13 @@
 "<strong>{1}</strong> to return to resolving conflicts.</html>"
 msgstr ""
+"<html>You didn''t finish to merge the differences in this conflict."
+"<br>Conflict resolutions won't be applied unless all differences<br>are "
+"resolved.Click <strong>{0}</strong> to close anyway."
+"<strong>Already<br>resolved differences won't be applied.</strong><br>Click "
+"<strong>{1}</strong> to return to resolving conflicts.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:210
 msgid "Conflict not resolved completely"
-msgstr ""
+msgstr "Konflikt nie je úplne vyriešený"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:246
@@ -4453,5 +4502,5 @@
 #, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr ""
+msgstr "Rozhodnúť konflikt pre ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4500,83 +4549,83 @@
 msgstr "Zobraziť priebeh z vybraných pôvodných"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+msgstr "Dialóg ešte nie je vytvorený. Odvoláva sa na createInstance() first"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "Vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "Otvoriť zoznam všetkých nahratých vrstiev."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "Odstrániť vybranú vrstvu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+msgstr "Nachádzajú sa neuložené zmeny vo vrstve''{0}''. Vymazať vrstvu určite?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr "Vymazať vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+msgstr "Naozaj chcete vymazať vrstvu ''{0}''?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+msgstr "Potvrdenie"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+msgstr "Áno"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+msgstr "Nie"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+msgstr "Zmazať všetko"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+msgstr "Vymazávaná vrstva {0} z {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "Zobraziť/Skryť"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "Prepnúť viditeľnosť zvolenej vrstvy."
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr "Aktivovať"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+msgstr "Aktivovať vybratú vrstvu"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+msgstr "Spojiť túto vrstvu do ďalšej vrstvy"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "Presunúť zvolenú vrstvu o riadok hore."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "Presunúť zvolenú vrstvu o riadok dole."
@@ -4584,8 +4633,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
 msgid "Information about layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+msgstr "Informácie o vrstve"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4595,28 +4644,30 @@
 msgstr[2] "Toto zmení až {0} objekty."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "Prázdna hodnota zmaže klúče"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<rôzne>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "Zmeniť hodnoty ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
 "Warning: failed to put properties dialog always on top. Exception was: {0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+"Varovanie: neúspešné umiestnenie dialógového okna nastavení vždy na vrchu. "
+"Výnimka bola: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4626,40 +4677,42 @@
 msgstr[2] "Zmeniť vlastnosti až {0} objektov."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "Vyberte prosím kľúč"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "Vyberte prosím hodnotu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+"Varovanie: neúspešné umiestnenie dialógového okna vždy navrchu. Výnimka "
+"bola: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 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/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "Vlastnosti/Členstvo(memberships)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "Vlastnosti pre zvolené objekty"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "Člen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "Pridať vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4676,39 +4729,39 @@
 msgstr "Pridať"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 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/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "Upraviť vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 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/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Vlastnosti: {0} / Memberships: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "Vlastnosti / Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "Zmeniť reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Naozaj zmazať výber z relacie {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 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/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "Zmazať vlastnosti"
@@ -4720,5 +4773,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "Relácie"
@@ -4750,31 +4803,31 @@
 msgstr "Vytvoriť kópiu z tejto relácie a otvoriť ju inom editovacom okne"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "Súčasný výber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "Otvoriť výber obsahu okien."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "Priblížiť na vybraté elementy(s)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "Obnoviť obsah výberu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "Priblížiť na výber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Sel.: Rel.:{0} / Cesty:{1} / Body:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4782,5 +4835,5 @@
 msgstr "Výber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4790,5 +4843,5 @@
 msgstr[2] "{0} cesty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4798,5 +4851,5 @@
 msgstr[2] "{0} relácií"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -4811,4 +4864,6 @@
 msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}"
 msgstr ""
+"Varovanie: neúspešné umiestnenie dialógového okna prepínač vždy na vrchu. "
+"Výnimka bola: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215
@@ -4853,17 +4908,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222
 msgid "Download all child relations (recursively)"
-msgstr ""
+msgstr "Nahrať všetky deti relácií (rekurzívne)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
 msgid "Download All Children"
-msgstr ""
+msgstr "Nahrať Všetky Deti"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
 msgid "Download selected relations"
-msgstr ""
+msgstr "Nahrať vybraté relácie"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
 msgid "Download Selected Children"
-msgstr ""
+msgstr "Nahrať vybraté deti"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
@@ -4884,8 +4939,9 @@
 "loaded"
 msgstr ""
+"<html>relácia dieťa<br>{0}<br>je na servery zmazaná.Nemôže byť načítaná."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
 msgid "Relation is deleted"
-msgstr ""
+msgstr "Relácia je zmazaná"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
@@ -4893,5 +4949,5 @@
 #, java-format
 msgid "Downloading relation {0}"
-msgstr ""
+msgstr "Nahrávam reláciu {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
@@ -4914,5 +4970,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
 msgid "Child Relations"
-msgstr ""
+msgstr "Relácia dieťa"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
@@ -4935,13 +4991,16 @@
 "<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ú "
+"reláciu.<br>Táto vytvorená kruhová závislosť and is dicuraged.<br>Ako chcete "
+"pokračovať s kruhovou závislosťou?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
 msgid "Remove them, clean up relation"
-msgstr ""
+msgstr "Odstraňte ich, vyčistite reláciu"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Ignore them, leave relation as is"
-msgstr ""
+msgstr "Ignorujte ich, nechajte reláciu tak ako je"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
@@ -4952,8 +5011,11 @@
 "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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
 msgid "Multiple members referring to same primitive"
-msgstr ""
+msgstr "Viacnásobné členy odkazujú na rovnaké obecné"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
@@ -4964,4 +5026,6 @@
 "''{0}''.</html>"
 msgstr ""
+"<html>Skúšate sa pridať reláciu do vlastných.<br><br>Tieto vytvorené kruhové "
+"odkazy a je preto znechutený.<br>Vynechanie relácie ''{0}''.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
@@ -4995,5 +5059,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Remove all members referring to one of the selected primitives"
-msgstr ""
+msgstr "Odstrániť všetky členy odkazujúce na jeden zo selektovaných pôvodných"
 
 #. putValue(NAME, tr("Remove Selected"));
@@ -5006,5 +5070,5 @@
 msgid ""
 "Select relation members which refer to primitives in the current selection"
-msgstr ""
+msgstr "Vybrať člena relácie, ktorý sa týka pôvodných v aktuálnom výbere"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
@@ -5014,9 +5078,9 @@
 "selection"
 msgstr ""
+"Vybrať člena relácie, ktorý odkazuje na {0} pôvodných v aktuálnom výbere"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "Zmazať vybraté relácie"
+msgstr "Výber pôvodných pre vybraté členy relácie"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -5049,5 +5113,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Remove the currently selected members from this relation"
-msgstr ""
+msgstr "Odstrániť práve vybraté členy z tejto relácie"
 
 #. putValue(NAME, tr("Remove"));
@@ -5058,13 +5122,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Delete the currently edited relation"
-msgstr ""
+msgstr "Vymazať práve vydanú reláciu"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
 msgid "Yes, create a conflict and close"
-msgstr ""
+msgstr "Áno, vyriešiť konflikt a zavrieť"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "No, continue editing"
-msgstr ""
+msgstr "Nie, pokračovať v editácii"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
@@ -5074,8 +5138,11 @@
 "conflict and close the editor?</html>"
 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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Conflict in data"
-msgstr ""
+msgstr "Konflikt v dátach"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
@@ -5085,8 +5152,10 @@
 "<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 "
+"rozhodnite najskôr tento konflikt, potom skúste znovu.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
 msgid "Apply the current updates"
-msgstr ""
+msgstr "Použiť súčasnú aktuálizáciu"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
@@ -5099,5 +5168,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5148,33 +5217,36 @@
 "new role?</html>"
 msgstr ""
+"<html>Nastavujete prázdnu funkciu na {0} pôvodných.<br>Toto sa rovná "
+"vymazaniu funkcie z týchto pôvodných.<br>Skutočne chcete použiť novú funkciu?"
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
 msgid "Yes, apply it"
-msgstr ""
+msgstr "Áno, Použiť to"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
 msgid "No, don't apply"
-msgstr ""
+msgstr "Nie, použite to"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Confirm empty role"
-msgstr ""
+msgstr "Potvrdiť prázdnu funkciu"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
 msgid "Zoom to"
-msgstr ""
+msgstr "Zväčšiť na"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
 msgid "Zoom to primitive the first selected member refers to"
-msgstr ""
+msgstr "Zväčšiť na pôvodné prvé vybraté členy odkazujúce na"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
 msgid "Zooming disabled because layer of this relation is not active"
-msgstr ""
+msgstr "Zväčšovanie je vypnuté pretože vrstva z tejto relácie nie je aktívna"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225
 msgid "Zooming disabled because there is no selected member"
-msgstr ""
+msgstr "Zväčšovanie je vypnuté pretože nie je vybratý člen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24
@@ -5193,5 +5265,5 @@
 #, java-format
 msgid "child.id >0 expected. Got {1}"
-msgstr ""
+msgstr "dieťa.id >0 očakávané. Got {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78
@@ -5228,9 +5300,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
 msgid "Load relation"
-msgstr ""
+msgstr "Načítať reláciu"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
 msgid "Warning: ignoring exception because task was cancelled. Exception was: "
 msgstr ""
+"Varovanie: ignorovanie výnimky pretože úloha bola zrušená. Výnimka bola: "
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70
@@ -5262,5 +5335,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 msgid "Name of location"
-msgstr ""
+msgstr "Názov miesta"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
@@ -5340,5 +5413,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "Miesta"
@@ -5385,21 +5458,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "typ"
@@ -5460,4 +5533,6 @@
 "Warning: failed to put history browser always on top. Exception was: {0}"
 msgstr ""
+"Varovanie: neúspešné umiestnenie prehliadača histórie vždy hore. Výnimka "
+"bola: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121
@@ -5474,5 +5549,5 @@
 #, java-format
 msgid "failed to set reference. reference id {0} doesn't match history id {1}"
-msgstr ""
+msgstr "failed to set reference. reference id {0} doesn't match history id {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
@@ -6203,72 +6278,521 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "Názov"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+"<html>Verzia <strong>{0}</strong> vytvoraná na <strong>{1}</strong> podľa "
+"<strong>{2}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr "Verzia {0} vytvorená na {1} podľa {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr "Verzia"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr "Obrázky pre {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr "Čítať GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Žiadny čas pre bod {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Nedá sa prečítať čas \"{0}\" z bodu {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr "Nenájdené žiadne obrázky s časovými značkami."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "Čítam {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr "Obrázky s GPS súradnicami"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr "Štart GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr "Koniec GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr "súčastná odchylka: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr "rozdiel časových pásiem: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "obrázok"
+msgstr[1] "obrázky"
+msgstr[2] "obrázkov"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} vo vnútry stopy (track)."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "Synchronizovať hodiny"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG obrázky (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Dáta v súbore \"{0}\" nemohli byť parsované."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "V súbore \"{0}\" nie je časová značka EXIF"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "Obrázok"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Zadajte dátum v tvare (mm/dd/rrrr HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr "Časová zóna GPS zariadenia (rozdiel od fotografie)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr "Synchronizovať čas s GPS zariadením"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr "Zadaný čas nemôže byť rozparsovaný"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr "gps poloha bodu"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "Prispôsobiť kresliacu trasu"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr "Použíť globálne nastavenie."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr "Kresliť spojnice medzi bodmi v tejto vrstve"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr "Nekresliť spojnice mezi bodmi v tejto vrstve"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr "Výber nastavenia kreslenej čiary"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "Prispôsobiť farbu"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Predvolené"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Zvoľte farbu"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr "Značky z pomenovaných bodov"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Pomenovanie trackpoints od {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "Importovať zvuk"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave Audiosúbory (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Zukové značky z {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "Importovať obrázky"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} stopa(track), "
+msgstr[1] "{0} stopy(track), "
+msgstr[2] "{0} stôp(track), "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} trasa, "
+msgstr[1] "{0} trasy, "
+msgstr[2] "{0} trás, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} waypoint (bod cesty)"
+msgstr[1] "{0} waypointy (body cesty)"
+msgstr[2] "{0} waypointov (bodov cesty)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr "Meno: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr "Popis: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr "Časové rozpätie: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr "Dĺžka: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "Konvertovať do dátovej vrstvy"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>Nahrať nespracované GPS dáta, ako mapové dáta je nežiadúce.<br>K "
+"chcete nahrať stopy (traces), pozrite sem:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Prevedené z: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr "Stiahnuť z OSM okolie tejto stopy (track)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr "Stiahnuť všetko vo vnútry:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr "{0} metrov"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr "Maximálna plocha na požiadavku:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} štvorcových km"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Táto akcia bude potrebovať<br>{0} samostatných stiahnutí dát."
+"<br>Chcete pokračovať?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr "Vo vrstve nie je žiadna GPX stopa ku ktorej by sa dal pripojiť zvuk."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"Niektoré body (waypointy) s časovou značkou pred začiatkom stopy(track), "
+"alebo za koncom, boli vynechané, alebo presunuté na začiatok."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Niektoré waypointy, ktoré bili príliš ďaleko od stopy pre rozumné určenie "
+"ich času boli vynechané."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Údajová vrstva {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr "mimo ukladanej oblasti"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr "verzia {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr "Varovanie: miešanie 0.6 a 0.5 dátového výsledku vo verzii 0.5"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} se skladá z:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} zmazané.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr "neuršený (unset)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr "Verzia API: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr "Previesť do GPX vrstvy"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6277,7 +6801,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6287,454 +6811,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "Názov"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-"<html>Verzia <strong>{0}</strong> vytvoraná na <strong>{1}</strong> podľa "
-"<strong>{2}</strong></html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr "Verzia {0} vytvorená na {1} podľa {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr "Verzia"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr "Obrázky pre {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr "Čítať GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Žiadny čas pre bod {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Nedá sa prečítať čas \"{0}\" z bodu {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr "Nenájdené žiadne obrázky s časovými značkami."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Čítam {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr "Obrázky s GPS súradnicami"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr "Štart GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr "Koniec GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr "súčastná odchylka: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr "rozdiel časových pásiem: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "obrázok"
-msgstr[1] "obrázky"
-msgstr[2] "obrázkov"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} vo vnútry stopy (track)."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "Synchronizovať hodiny"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG obrázky (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Dáta v súbore \"{0}\" nemohli byť parsované."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "V súbore \"{0}\" nie je časová značka EXIF"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "Obrázok"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Zadajte dátum v tvare (mm/dd/rrrr HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr "Časová zóna GPS zariadenia (rozdiel od fotografie)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr "Synchronizovať čas s GPS zariadením"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr "Zadaný čas nemôže byť rozparsovaný"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr "gps poloha bodu"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "Prispôsobiť kresliacu trasu"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "Použíť globálne nastavenie."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr "Kresliť spojnice medzi bodmi v tejto vrstve"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr "Nekresliť spojnice mezi bodmi v tejto vrstve"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr "Výber nastavenia kreslenej čiary"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "Prispôsobiť farbu"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Predvolené"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Zvoľte farbu"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr "Značky z pomenovaných bodov"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Pomenovanie trackpoints od {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "Importovať zvuk"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave Audiosúbory (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Zukové značky z {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "Importovať obrázky"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} stopa(track), "
-msgstr[1] "{0} stopy(track), "
-msgstr[2] "{0} stôp(track), "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} trasa, "
-msgstr[1] "{0} trasy, "
-msgstr[2] "{0} trás, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} waypoint (bod cesty)"
-msgstr[1] "{0} waypointy (body cesty)"
-msgstr[2] "{0} waypointov (bodov cesty)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr "Meno: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr "Popis: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr "Časové rozpätie: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr "Dĺžka: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "Konvertovať do dátovej vrstvy"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>Nahrať nespracované GPS dáta, ako mapové dáta je nežiadúce.<br>K "
-"chcete nahrať stopy (traces), pozrite sem:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Prevedené z: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr "Stiahnuť z OSM okolie tejto stopy (track)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr "Stiahnuť všetko vo vnútry:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr "{0} metrov"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr "Maximálna plocha na požiadavku:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} štvorcových km"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Táto akcia bude potrebovať<br>{0} samostatných stiahnutí dát."
-"<br>Chcete pokračovať?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr "Vo vrstve nie je žiadna GPX stopa ku ktorej by sa dal pripojiť zvuk."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-"Niektoré body (waypointy) s časovou značkou pred začiatkom stopy(track), "
-"alebo za koncom, boli vynechané, alebo presunuté na začiatok."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Niektoré waypointy, ktoré bili príliš ďaleko od stopy pre rozumné určenie "
-"ich času boli vynechané."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Údajová vrstva {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr "mimo ukladanej oblasti"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr "verzia {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr "Varovanie: miešanie 0.6 a 0.5 dátového výsledku vo verzii 0.5"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} se skladá z:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} zmazané.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr "neuršený (unset)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr "Verzia API: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr "Previesť do GPX vrstvy"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -7133,5 +7208,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "Vozidlo"
@@ -7148,16 +7223,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "Bicykel"
@@ -7185,14 +7262,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "Pešo"
@@ -7414,19 +7494,19 @@
 msgstr "Jazyk"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr "Povoliť vstavané východzie hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr "Povoliť built-in ocon východzí"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr "Map Paint Styles"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr "Použitý štýl"
@@ -7457,5 +7537,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93
 msgid "Enter URL"
-msgstr ""
+msgstr "Zadať URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
@@ -7470,5 +7550,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115
 msgid "JOSM Plugin description URL"
-msgstr ""
+msgstr "JOSM Plugin description URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142
@@ -7555,39 +7635,11 @@
 msgstr "Heslo pre proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Základná URL pre OSM server (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr "Prihlasovacie meno (e-mail) pre OSM konto."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"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ť."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "Základná Serverová URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr "OSM užívateľské meno (e-mail)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "OSM heslo"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
-"<html>Varovanie: Heslo je uložené v jednoduchom texte v súbore nastavení."
-"<br>Heslo je  prenesené v jednoduchom texte na server, kódované v URL."
-"<br><b>Nepoužite vzácne Heslo.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -7908,6 +7960,6 @@
 msgid "Change {0} object"
 msgid_plural "Change {0} objects"
-msgstr[0] "Zmeniť {0} objekt"
-msgstr[1] "Zmeniť {0} objekty"
+msgstr[0] "Zmeniť {0} objekty"
+msgstr[1] "Zmeniť {0} objekt"
 msgstr[2] "Zmeniť {0} objektov"
 
@@ -7959,7 +8011,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "Nemôžem čítať \"{0}\""
+msgstr "Nemôžem exportovať \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -8064,7 +8116,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "Neznáma funkcia ''{0}''."
+msgstr "Neznámy mód {0}."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8087,5 +8139,5 @@
 #, java-format
 msgid "Fetching {0} with id {1} from ''{2}''"
-msgstr ""
+msgstr "Donášam {0} s id {1} z ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:371
@@ -8098,5 +8150,5 @@
 #, java-format
 msgid "Fetching a package of {0} from ''{1}''"
-msgstr ""
+msgstr "Donášam balíček z {0} pre ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408
@@ -8201,14 +8253,14 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361
 msgid "Waiting 10 seconds ... "
-msgstr ""
+msgstr "Čakanie 10 sekúnd ... "
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369
 msgid "OK - trying again."
-msgstr ""
+msgstr "OK - skúšam znovu."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
 #, java-format
 msgid "Starting retry {0} of {1}."
-msgstr ""
+msgstr "Spúšťam opakovanie {0} z {1}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -8233,23 +8285,51 @@
 msgstr "Poškodený bz2 súbor."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "Nesprávne heslo alebo meno."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Upozornenie: Heslo sa posiela nešifrované."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "Uložiť meno a heslo (nešifrovane)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "Zadajte heslo"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
 msgstr "Prihlásenie"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr "Prihlasovacie meno (e-mail) pre OSM konto."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"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ť."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr "OSM užívateľské meno (e-mail)"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "OSM heslo"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
+"<html>Varovanie: Heslo je uložené v jednoduchom texte v súbore nastavení."
+"<br>Heslo je  prenesené v jednoduchom texte na server, kódované v URL."
+"<br><b>Nepoužite vzácne Heslo.</b></html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -8259,7 +8339,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-msgstr "očakávaný príklad z OsmDataLayer alebo GpxLayer. Got ''{0}''."
+msgstr "Očakávaný príklad z OsmDataLayer. Got ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -8267,4 +8347,5 @@
 msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
 msgstr ""
+"<html>Nejaká chyba nastala počas ukladania.<br>Chyba je: <br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
@@ -8274,4 +8355,6 @@
 "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
@@ -8421,15 +8504,17 @@
 "missing in the loaded data and is therefore incomplete too"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+"Označená cesta {0} s {1} bodov neúplných pretože aspoň jeden bod je "
+"vynechaný v nahratých dátach a je preto nekompletná tiež"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "Neznámy typ člena pre ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr "Neznámy typ člena relácie {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "Pripravujem OSM údaje..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr "Zle formulované id bodu"
@@ -8490,4 +8575,6 @@
 "Exception was: {1}"
 msgstr ""
+"Neúspešné zatvorenie changeset {0}, budú zavreté po uplynutí časového limitu "
+"servera. Výnimka bola: {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:172
@@ -8561,4 +8648,5 @@
 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ý."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
@@ -8646,9 +8734,9 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306
 msgid "The plugin could not be removed. Probably it was already disabled"
-msgstr ""
+msgstr "Plugin nemôže byť odstránený. Pravdepodobne to bolo už vypnuté."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
 msgid "Plugin information"
-msgstr ""
+msgstr "Informácia o pluginoch"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
@@ -8791,4 +8879,6 @@
 "was: {1}"
 msgstr ""
+"Varovanie: neúspešný vstup do adresára ''{0}'' pre bezpečnostný dôvod . "
+"Výnimka bola: {1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201
@@ -8798,4 +8888,6 @@
 "problem. JOSM will stop working."
 msgstr ""
+"Fatálne: neúspešná lokalizácia obrázka ''{0}''. Toto je vážny konfiguračný "
+"problém. JOSM prestane pracovať."
 
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447
@@ -8836,5 +8928,5 @@
 #, java-format
 msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}"
-msgstr ""
+msgstr "Varovanie:neúspešné čítanie MOTD z ''{0}''. Výnimka bola: {1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61
@@ -8845,4 +8937,6 @@
 "was: {1}"
 msgstr ""
+"Varovanie: neúspešná čítanie MOTD z ''{0}'' pre bezpečnostný dôvod. Výnimka "
+"bola: {1}"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
@@ -8890,5 +8984,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr "Popis"
@@ -9305,5 +9399,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr "Chyba pri nahrávaní súboru"
@@ -9555,5 +9649,4 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
-#, fuzzy
 msgid ""
 "To enable the cadastre WMS plugin, change\n"
@@ -9561,6 +9654,7 @@
 "projection and retry"
 msgstr ""
-"K zapnutiu cadastre WMS pluginu, zmeňte\n"
-"projekciu na Lambert a reštartujte JOSM"
+"Zapnúť the cadastre WMS plugin, zmeniť\n"
+"aktuálnu projekciu na jednu z  the cadastre\n"
+"projekcií a opakovať"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9653,5 +9747,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -10196,7 +10290,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr "voda"
@@ -10381,7 +10475,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "meno"
+msgstr "bez mena"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10947,12 +11040,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "začiatok (start)"
+msgstr "{0} štart"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0} bod"
+msgstr "{0} koniec"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -11096,5 +11189,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr "Názov ulice"
@@ -11930,7 +12023,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr "budovy"
@@ -11944,5 +12037,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr "oblasť(plocha)"
@@ -12203,26 +12296,22 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "Prosím vyberte riadok na úpravu."
+msgstr "Prosím vybrať WMS vrstvu pre nastavenie."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "Uložiť WMS vrstvu"
+msgstr "Vybrať WMS vrstvu"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Start adjusting"
-msgstr "Začať trasovanie"
+msgstr "Žačať nastavovanie"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
 msgid "There are currently no WMS layer to adjust."
-msgstr ""
+msgstr "Teraz tam nie sú WMS vrstvy na nastavovanie."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "Žiadne zmeny pre uloženie."
+msgstr "Žiadne vrstvy na nastavovanie"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -12236,19 +12325,19 @@
 "Môže to viesť k zlým súradniciam."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr "Automatické sťahovanie"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS vrstva ({0}), sa automaticky sťahuje vo zväčšení (zoom) {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS vrstva ({0}), sťahovaná vo zväčšení (zoom) {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -12256,42 +12345,42 @@
 "Požadovaná oblasť je príliš veľká. Prosím priblížte ju, alebo zmente oblasť."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr "Stiahnuť viditeľné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr "Zmena rozlíšenia"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr "Nahrať poškodené dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr "Alfa kanál"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr "Uložiť WMS vrstvu do súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr "Uložiť WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr "Nahrať WMS vrstvu zo súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr "Načítať WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Nepodporovaná verzia WMS súboru; nájdené {0}, očakávané {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr "Chyba formátu súboru"
@@ -12672,4 +12761,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12706,5 +12797,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr "Komunikácie"
@@ -12715,5 +12806,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Dialnica"
@@ -12722,5 +12813,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr "Upraviť diaľnicu"
@@ -12747,10 +12838,10 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
-msgstr "Odkaz"
+msgstr "Ref. číslo"
 
 #. item "Streets/Motorway" text "Name"
@@ -12789,21 +12880,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr "Vrstva"
@@ -12817,8 +12908,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr "Jazdné pruhy"
@@ -12836,15 +12927,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr "Max. rýchlosť (km/h)"
@@ -12881,16 +12972,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr "Jednosmerka"
@@ -12932,19 +13023,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Most"
@@ -12980,19 +13071,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr "Tunel"
@@ -13026,18 +13117,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr "Výkop"
@@ -13071,18 +13162,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr "Násyp"
@@ -13090,5 +13181,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr "Dialničná prípojka"
@@ -13097,5 +13188,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr "Upraviť dialničnú prípojku"
@@ -13103,5 +13194,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr "Cesta pre motorové vozidlá"
@@ -13110,5 +13201,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr "Upraviť cestu pre motorové vozidlá"
@@ -13118,6 +13209,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr "Cesta pre motorové vozidlá"
@@ -13125,5 +13216,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr "Prípojka cesty pre motorové vozidla"
@@ -13132,5 +13223,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr "Upraviť prípojku cesty pre motorové vozidla"
@@ -13143,5 +13234,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Cesta I. triedy"
@@ -13150,5 +13241,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr "Upraviť cestu I. triedy"
@@ -13156,10 +13247,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr "Prípojka cesty I. triedy"
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr "Upraviť prípojku cesty I. triedy"
@@ -13171,5 +13262,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Cesta II. triedy"
@@ -13179,5 +13270,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr "Upraviť cestu II. triedy"
@@ -13185,5 +13276,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr "Cesta III. triedy"
@@ -13193,5 +13284,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr "Upraviť cestu III. triedy"
@@ -13203,5 +13294,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Miestna cesta neklasifikovaná (Unclassified)"
@@ -13211,5 +13302,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr "Upraviť Neklasifikovanú cestu"
@@ -13236,19 +13327,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr "Šírka (v metroch)"
@@ -13260,5 +13351,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Ulica (miestna komunikácia)"
@@ -13267,5 +13358,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr "Upraviť ulicu"
@@ -13289,13 +13380,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr "Povrch"
@@ -13315,20 +13406,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr "spevnený"
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr "nespevnený"
@@ -13336,12 +13427,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr "dlažbová kocka (cobblestone)"
@@ -13349,5 +13440,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr "Obytná zóna"
@@ -13356,5 +13447,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr "Upraviť Obytnú zónu"
@@ -13362,5 +13453,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr "Obslužná cesta (Service)"
@@ -13369,5 +13460,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr "Upraviť obslužnú cestu (Service)"
@@ -13377,18 +13468,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr "Typ obslužnej cesty (serviceway)"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr "ulička(bočna ulica)"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr "príjazdová cesta"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr "parkovacia ulička(parking_aisle)"
@@ -13396,5 +13487,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr "Parkovacia ulička (Parking Aisle)"
@@ -13404,5 +13495,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr "Upraviť parkovaciu uličku (Parking Aisle)"
@@ -13410,5 +13501,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr "Cesta (neznámy typ)"
@@ -13417,5 +13508,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr "Upraviť cestu neznámeho typu"
@@ -13424,20 +13515,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr "Cestné obmedzenie"
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr "Upraviť cestné obmedzenie"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr "Mýto (Toll)"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr "Slepá ulica"
@@ -13450,8 +13541,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr "Prístup"
@@ -13495,23 +13586,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr "áno"
@@ -13524,40 +13615,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr "private (len pre vlastníka)"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr "určený"
@@ -13570,19 +13661,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr "miesto určenia (cieľ)"
@@ -13605,65 +13696,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr "permissive (súhlas vlastníka pozemku)"
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr "farmársky (agricultural)"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr "nie"
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr "Malé nákladná autá a dodávky"
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Nákladné vozidlá"
@@ -13678,10 +13769,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr "Kôň"
@@ -13697,13 +13788,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr "Motocykel"
@@ -13719,30 +13810,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr "Motorové vozidlo"
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr "Dopravná obsluha"
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr "Motorová loď"
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr "Loď"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr "Min. rýchlosť (km/h)"
@@ -13750,25 +13841,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr "Max. hmotnosť (ton)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr "Max. Výška(v metroch)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr "Max. Šírka (v metroch)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr "Max. Dĺžka (v metroch)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr "Kruhový objazd"
@@ -13779,5 +13870,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr "Upraviť kruhový objazd"
@@ -13799,9 +13890,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr "Typ"
@@ -13821,10 +13912,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr "dialnica (motorway)"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr "dialničná prípojka"
@@ -13846,10 +13937,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr "cesta pre motorové vozidlá (trunk)"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr "prípojka cesty pre motorové vozidlá"
@@ -13871,10 +13962,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr "cesta prvej triedy"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr "prípojka cesty I. triedy"
@@ -13896,6 +13987,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr "cesta druhej triedy"
@@ -13909,9 +14000,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr "cesta tretej triedy"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr "cesta bez klasifikácie (unclassified)"
@@ -13925,9 +14016,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr "obytná (osídlená)"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr "obytná zóna"
@@ -13957,10 +14048,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr "obslužná (service)"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr "autobusová linka"
@@ -13968,4 +14059,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13983,6 +14081,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr "konštrukcia"
@@ -13993,10 +14091,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr "Editácia mosta"
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr "Upraviť Tunel"
@@ -14004,19 +14102,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr "Cesty"
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr "Stavba"
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr "Upraviť komunikáciu vo výstavbe"
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr "Križovatka"
@@ -14032,5 +14130,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr "kruhový objazd (roundabout)"
@@ -14039,5 +14137,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr "Cesta pre kone"
@@ -14045,5 +14143,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr "Upraviť cestu pre kone"
@@ -14051,5 +14149,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr "Cesta pre cyklistov"
@@ -14059,5 +14157,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr "Upraviť cyklistickú cestu"
@@ -14065,5 +14163,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr "Chodník"
@@ -14072,5 +14170,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr "Upraviť chodník"
@@ -14078,5 +14176,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr "Pešia zóna"
@@ -14085,5 +14183,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr "Upraviť pešiu zónu"
@@ -14091,5 +14189,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr "Schody"
@@ -14099,5 +14197,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr "Upraviť únikové schody"
@@ -14106,5 +14204,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr "Poľná cesta (Track)"
@@ -14113,14 +14211,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr "Upraviť Stopu (Track)"
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr "betón (concrete)"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr "štrk (gravel)"
@@ -14128,18 +14226,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr "zem (ground)"
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr "tráva (grass)"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr "piesok (sand)"
@@ -14147,5 +14245,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr "Kvalita stopy poľnej cesty 1"
@@ -14154,5 +14252,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr "Upraviť kvalitu stopy poľnej cesty 1"
@@ -14160,5 +14258,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr "Kvalita stopy poľnej cesty 2"
@@ -14167,5 +14265,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr "Upraviť kvalitu stopy poľnej cesty 2"
@@ -14173,5 +14271,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr "Kvalita stopy poľnej cesty 3"
@@ -14180,5 +14278,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr "Upraviť kvalitu stopy poľnej cesty 3"
@@ -14186,5 +14284,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr "Kvalita stopy poľnej cesty 4"
@@ -14193,5 +14291,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr "Upraviť kvalitu stopy poľnej cesty 4"
@@ -14199,5 +14297,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr "Kvalita stopy poľnej cesty 5"
@@ -14206,5 +14304,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr "Upraviť kvalitu stopy poľnej cesty 5"
@@ -14213,5 +14311,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr "Cesta (chodník)"
@@ -14220,13 +14318,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr "Upraviť cestu (chodník)"
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr "Snežný skúter"
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr "Lyže"
@@ -14234,5 +14332,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr "Turistika"
@@ -14242,5 +14340,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr "Upraviť Turistiku"
@@ -14248,5 +14346,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr "Horská turistika"
@@ -14256,5 +14354,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr "Upraviť horskú turistiku"
@@ -14262,5 +14360,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr "Náročná horská turistika"
@@ -14270,5 +14368,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Upraviť náročnú horskú turistiku"
@@ -14276,5 +14374,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr "Vysokohorská turistika"
@@ -14284,5 +14382,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr "Upraviť vysokohorskú turistiku"
@@ -14290,5 +14388,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr "Náročná vysokohorská turistika"
@@ -14298,5 +14396,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Upraviť náročnú vysokohorskú turistiku"
@@ -14304,5 +14402,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr "Tažká vysokohorská turistika"
@@ -14312,5 +14410,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Upraviť ťažkú vysokohorskú turistiku"
@@ -14318,10 +14416,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr "Cestné objekty"
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr "Ďialničná križovatka"
@@ -14329,15 +14427,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr "Upraviť diaľničnú križovatku"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr "Číslo"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr "Služby"
@@ -14345,5 +14443,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr "Upraviť servisnú stanicu (autoservis)"
@@ -14378,14 +14476,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr "Operátor"
@@ -14394,5 +14492,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr "Semafor"
@@ -14402,5 +14500,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr "Typ prechodu pre chodcov"
@@ -14409,27 +14507,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr "neriadený"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr "semafor"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr "ostrovček"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr "neoznačený"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr "Prechod pre jazdcov na koňoch"
@@ -14437,6 +14535,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr "Prechod pre cyklistov"
@@ -14445,11 +14543,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr "Prechod cez cestu s obsluhou"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr "Typy prechodov pre chodcov (UK viď. en.wikipedia.org)"
@@ -14457,31 +14555,31 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr "prechod pre chodcov (zebra)"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr "prechod pre chodcov (len čiarkované okraje)"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr "toucan (prechod pre chodcov a cyklistov, len čiarkované okraje)"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr "puffin (prechod pre chodcov a cyklistov, len čiarkované okraje)"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr ""
 "pegasus (prechod pre chodcov a jazdcov na koňoch, len čiarkované okraje)"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr "tiger (prechod pre chodcov a cyklistov žlté pruhy)"
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr "Zastaviť (stop)"
@@ -14489,5 +14587,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr "Prechod pre chodcov"
@@ -14496,14 +14594,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr "Upraviť križovanie"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr "Typ mena (UK)"
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr "Malý kruhový objazd"
@@ -14514,14 +14612,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr "Smer"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr "v smere hodinových ručičiek (pravotočivý)"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr "Turning Circle (zaokrúhlený koniec cesty pre ľahšie otáčanie sa aut)"
@@ -14531,20 +14629,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr "Hranica mesta/obce"
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr "Upraviť označenie hranice mesta/obce"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr "Druhé meno"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr "Kamera na meranie rýchlosti"
@@ -14552,5 +14650,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr "Núdzový telefón"
@@ -14558,5 +14656,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr "Sklon"
@@ -14564,5 +14662,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr "Prudký sklon"
@@ -14571,10 +14669,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr "Brod"
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr "Upraviť brod"
@@ -14582,5 +14680,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr "Horský priesmyk"
@@ -14588,5 +14686,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr "Upraviť horský priesmyk"
@@ -14598,7 +14696,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr "Nadmorská výška"
@@ -14606,5 +14704,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr "Prekážka (Barriers)"
@@ -14612,5 +14710,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr "Stĺpik"
@@ -14618,5 +14716,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr "Upraviť stĺpik"
@@ -14655,18 +14753,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr "Povolená prevádzka:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr "Cyklo prekážka (Cycle Barrier)"
@@ -14675,5 +14777,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr "Balvan (Block)"
@@ -14681,5 +14783,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr ""
@@ -14689,5 +14791,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr ""
@@ -14696,5 +14798,5 @@
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr "Bus trap (rohož cez cestu zabraňujúca vjazdu vozidiel okrem autobusov)"
@@ -14702,15 +14804,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr "Špičky (hroty)"
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr "Upraviť Hroty"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr "Mýtna búdka"
@@ -14718,5 +14820,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr "Upraviť mýtnu búdku"
@@ -14724,10 +14826,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr "Hraničná kontrola"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr "Upraviť hraničnú kontrolu"
@@ -14737,5 +14839,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr "Živý plot (Hedge)"
@@ -14744,5 +14846,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr "Plot"
@@ -14751,5 +14853,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr "Hradby"
@@ -14757,5 +14859,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr "Mestské hradby"
@@ -14764,5 +14866,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr "Oporný múr"
@@ -14774,15 +14876,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr "Vstup"
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr "Upraviť vstup"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr "Brána"
@@ -14790,50 +14892,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr "Upraviť bránu"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr "Závora (Lift Gate)"
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr "Upraviť závoru (Lift Gate)"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr "Brána pre zvieratá (Hampshire)"
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr "Upraviť bránu pre zvieratá (hampshire)"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr "Brána pre otváranie predkom auta (bump)"
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr "Upraviť bránu pre otváranie predkom auta (bump)"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr "Automatická brána pre hospodárske zvieratá (Kissing)"
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr "Upraviť automatickú bránu pre hosp. zvieratá (kissing)"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr "Turniket (Stile)"
@@ -14841,15 +14943,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr "Upraviť turniket"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+#, fuzzy
+msgid "Turnstile"
+msgstr "Točňa"
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "Upraviť turniket"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr "Sally port (vstupný portál do pevnosti s vonkajšou a vnútornou bránou)"
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr ""
@@ -14862,10 +14976,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr "Voda"
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr "Prameň"
@@ -14873,5 +14987,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr "Upraviť prameň"
@@ -14879,5 +14993,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr "Odvodňovací kanál, odtok"
@@ -14885,10 +14999,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr "Upraviť odvodňovací kanál, odtok"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr "Potok"
@@ -14896,10 +15010,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr "Upraviť potok"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr "Prieplav"
@@ -14907,10 +15021,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr "Upraviť prieplav"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr "Rieka"
@@ -14920,5 +15034,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr "Upraviť rieku"
@@ -14926,15 +15040,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr "Upraviť vodu"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr "Zem (Pevnina)"
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr "Upraviť Zem (Pevnina)"
@@ -14942,15 +15056,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr "Basin (Kotvisko pre lode)"
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr "Upraviť Basin (Kotvisko pre lode)"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr "Nádrž"
@@ -14958,15 +15072,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr "Upraviť nádrž"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr "Krytá nádrž"
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr "Upraviť krytú nádrž"
@@ -14974,5 +15088,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr "Riečny breh"
@@ -14981,10 +15095,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr "Upraviť riečny breh"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr "Mokraď"
@@ -14995,14 +15109,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr "Upraviť mokraď"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr "Močiar"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr "slatina"
@@ -15016,35 +15130,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr "močiar (marsh)"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr "mokraď´s rákosím"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr "soľná bažina"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr "prílivová oblasť"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr "mangrovová oblasť"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr "Blato"
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr "Upraviť blato"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr "Pláž"
@@ -15052,20 +15166,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr "Upraviť pláž"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr "Záliv"
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr "Upraviť záliv"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr "Útes"
@@ -15073,10 +15187,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr "Upraviť útes"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr "Pobrežie"
@@ -15084,5 +15198,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr "Upraviť pobrežie"
@@ -15090,5 +15204,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr "Prievoz, trajekt"
@@ -15096,5 +15210,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr "Upraviť prievoz, trajekt"
@@ -15103,5 +15217,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr "Lodenica"
@@ -15109,10 +15223,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr "Upraviť lodenicu"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr "Dok, prístavná hrádza"
@@ -15120,5 +15234,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr "Upraviť dok, prístavnú hrádzu"
@@ -15126,5 +15240,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr "Priehrada, nádrž"
@@ -15132,15 +15246,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr "Upraviť priehradu, nádrž"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr "Vodné objekty"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr "Plavebná komora"
@@ -15149,5 +15263,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr "Priehradzka"
@@ -15155,20 +15269,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr "Upraviť priehradzku"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr "Vodopád"
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr "Upraviť vodopád"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr "Turning Point (koniec cesty)"
@@ -15177,15 +15291,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr "Prístav (Marina)"
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr "Upraviť Prístav (Marina)"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr "Mólo"
@@ -15193,10 +15307,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr "Upraviť mólo"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr "Prístavisko prievozu, trajektu"
@@ -15204,10 +15318,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr "Upraviť prístavisko prievozu, trajektu"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr "Slipway (rampa na vyzdvihnutie lode z vody na breh)"
@@ -15217,5 +15331,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr "Upraviť slipway (rampa na vyzdvihnutie lode z vody na breh)"
@@ -15223,10 +15337,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr "Železnica"
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr "Železnica (štandardná)"
@@ -15234,5 +15348,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr "Upraviť železničnú koľaj"
@@ -15262,8 +15376,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr "Voliteľné typy"
@@ -15277,35 +15391,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr "železničná vlečka v závode"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr "vedľajšia koľaj (napr: na stanici)"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr "železničná vlečka"
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr "Úzkorozchodná železnica"
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr "Upraviť úzkorozchodnú železnicu"
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr "Jednokoľajka, vysutá dráha"
@@ -15313,45 +15427,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr "Upraviť jednokoľajku, vysutú dráhu"
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr "Historická železnica"
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr "Upraviť zachovanú železnicu (v prevádzke)"
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr "Rýchloelektrička"
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr "Upraviť električku"
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr "Metro"
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr "Upraviť metro"
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr "Električka"
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr "Upraviť električku"
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr "Autobusová linka"
@@ -15359,5 +15473,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr "Upraviť autobusovú linku"
@@ -15366,14 +15480,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr "Nepoužívaná železnica"
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr "Upraviť nepoužívanú železnicu"
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr "Opustená železnica"
@@ -15382,5 +15496,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr "Železničné priecestie"
@@ -15389,5 +15503,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr "Peší prechod cez železnicu"
@@ -15397,5 +15511,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr "Typy prechodov cez cestu"
@@ -15403,5 +15517,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr "Točňa"
@@ -15410,10 +15524,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr "Lanovka"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr "Sedačková lanovka"
@@ -15421,10 +15535,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr "Upraviť sedačkovú lanovku"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr "Lyžiarsky vlek Drag_lift(nepoužíva sa, použite piste:lift=platter)"
@@ -15432,5 +15546,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr ""
@@ -15438,5 +15552,5 @@
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr "Kabínková lanovka"
@@ -15444,10 +15558,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr "Upraviť kabínkovú lanovku"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr "Gondola"
@@ -15455,5 +15569,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr "Upraviť Gondolu"
@@ -15461,5 +15575,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr "Stanica"
@@ -15470,10 +15584,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr "Upraviť stanicu"
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr "Čerpacia stanica"
@@ -15483,5 +15597,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr "Upraviť čerpaciu stanicu"
@@ -15497,5 +15611,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15505,5 +15619,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr "Upraviť parkovisko"
@@ -15511,41 +15625,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr "Kapacita"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr "povrch"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr "mnohoposchodový"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr "podzemie"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr "záchytné parkovisko so zastávkou MHD"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr "Miesta pre vozíčkárov"
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr "Poplatok"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr "Umývačka"
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr "Upraviť umývačku aut"
@@ -15553,5 +15667,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr "Obchod"
@@ -15559,15 +15673,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr "Upraviť obchod s autami"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr "Servis"
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr "Upraviť autoservis"
@@ -15575,5 +15689,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr "Požičovňa"
@@ -15582,10 +15696,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr "Upraviť autopožičovňu"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr "Autopožičovňa (aj pre krátkodobé požičanie auta aj 1 hod.)"
@@ -15593,5 +15707,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr "Upraviť autopožičovňu (aj pre krátkodobé požičanie auta aj 1hod.)"
@@ -15599,5 +15713,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr "Upraviť parkovisko bicyklov"
@@ -15606,5 +15720,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr "Upraviť požičovňu bicyklov"
@@ -15613,15 +15727,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr "Upraviť bicyklový obchod"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "Hromadná doprava"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -15629,5 +15743,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr "Železničná zastávka"
@@ -15635,5 +15749,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr "Upraviť zastávku"
@@ -15641,5 +15755,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr "Zastávka električky"
@@ -15648,5 +15762,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr "Upraviť zastávku električky"
@@ -15654,5 +15768,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr "Železničné nástupište"
@@ -15661,5 +15775,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr "Upraviť železničné nástupište"
@@ -15671,5 +15785,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr "Referencie (číslo stopy(track))"
@@ -15677,10 +15791,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr "Oblasť"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr "Vchod do metra"
@@ -15689,10 +15803,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr "Upraviť vchod do metra"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr "Invalidný vozík"
@@ -15701,5 +15815,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr "Autobusová stanica"
@@ -15708,5 +15822,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr "Upraviť autobusovú stanicu"
@@ -15714,5 +15828,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr "Autobusová zastávka"
@@ -15722,5 +15836,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr "Upraviť autobusovú zastávku"
@@ -15731,6 +15845,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr "Prístrešok"
@@ -15738,10 +15852,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr "Autobusové nástupište"
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr "Upraviť autobusové nástupište"
@@ -15749,5 +15863,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr "Taxi"
@@ -15755,5 +15869,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr "Upraviť stanicu taxíkov"
@@ -15761,5 +15875,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr "Letisko"
@@ -15767,15 +15881,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr "Upraviť letisko"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr "ICAO"
@@ -15784,5 +15898,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr "Ubytovanie"
@@ -15794,5 +15908,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -15801,15 +15915,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr "Upraviť hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr "Hviezdičkový"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr "Motel"
@@ -15817,20 +15931,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr "Upraviť motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr "Penzión"
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr "Upraviť penzión"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr "Chata"
@@ -15838,10 +15952,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr "Upraviť chatu"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr "Ubytovňa"
@@ -15849,30 +15963,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr "Upraviť ubytovňu"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr "Horská chata"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr "Upraviť horskú chatu"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr "Kemping pre obytné prívesy"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr "Upraviť kemping pre obytné prívesy"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr "Stanový tábor"
@@ -15880,10 +15994,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr "Upraviť stanový tábor"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "Jedlo + Pitie"
@@ -15894,5 +16008,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Reštaurácia"
@@ -15900,5 +16014,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr "Upraviť reštauráciu"
@@ -15906,5 +16020,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr "Kuchyňa"
@@ -15912,61 +16026,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr "talianska"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr "čínska"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr "grécka"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr "nemecká"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr "indická"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr "regionálna"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr "turecká"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr "ázijská"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr "thajská"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr "mexická"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr "japonská"
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr "Rýchle občerstvenie"
@@ -15974,9 +16088,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr "Upraviť reštauráciu rýchleho občerstvenia"
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr "Kaviareň"
@@ -15984,10 +16098,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr "Upraviť kaviareň"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr "Krčma"
@@ -15995,20 +16109,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr "Upraviť krčmu"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr "Záhradná reštaurácia"
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr "Upraviť záhradnú reštauráciu"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr "Bar (výčap)"
@@ -16016,10 +16130,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr "Upraviť bar (výčap)"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr "Nočný klub"
@@ -16027,20 +16141,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr "Upraviť nočný klub"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "Turistika"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr "Atrakcia"
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr "Upraviť atrakciu"
@@ -16049,11 +16163,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr "Otváracia doba"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "Múzeum"
@@ -16061,10 +16175,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr "Upraviť múzeum"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "Zoo"
@@ -16073,10 +16187,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr "Upraviť zoo"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr "Výhliadka"
@@ -16084,25 +16198,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr "Upraviť výhliadku"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr "Výhliadková veža"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr "Zábavný park"
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr "Upraviť zábavný park"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr "Umelecké dielo"
@@ -16110,5 +16224,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr "Upraviť umelecké dielo"
@@ -16116,5 +16230,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr "Informačná kancelária"
@@ -16122,80 +16236,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr "Upraviť informačnú kanceláriu"
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr "Typ mapy"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr "mapa"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr "mapa mesta"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr "turistická mapa"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr "cykloturistická mapa"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
 msgid "Closer Description"
 msgstr "Bližší popis"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1701
 msgid "Information Board"
 msgstr "Informačná tabuľa"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Board Type"
 msgstr "Typ tabuľe"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "board"
 msgstr "tabuľa"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "history"
 msgstr "história"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "nature"
 msgstr "príroda"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "wildlife"
 msgstr "divoká príroda"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Guidepost (Hiking)"
 msgstr "Informačné miesto (Turistika) (Guidepost (Hiking))"
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr "Ostatné(iné) informačné body(miesta)"
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr "Upraviť prístrešok"
@@ -16203,25 +16317,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr "Ohnisko"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr "Výletné miesto"
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr "Upraviť výletné miesto"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "Historické miesta"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "Hrad"
@@ -16230,20 +16344,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr "Upraviť hrad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "Ruiny"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr "Upraviť ruiny"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr "Archeologické nálezisko"
@@ -16252,10 +16366,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr "Upraviť archeologické nálezisko"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr "Bojisko"
@@ -16263,5 +16377,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr "Upraviť bojisko"
@@ -16269,15 +16383,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr "Pamätihodnosť, pamätník"
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr "Upraviť pamätihodnosť, pamätník"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr "Pomník"
@@ -16285,45 +16399,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr "Upraviť pomník"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr "Kríž pri ceste"
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr "Upraviť kríž pri ceste"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr "Božia muka"
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr "Upraviť božiu muku"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "Oddych (Leisure)"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr "Vodný zábavný park"
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr "Upraviť vodný zábavný park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "Ihrisko"
@@ -16331,15 +16445,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr "Upraviť ihrisko"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "Rybolov"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr "Upraviť rybolov"
@@ -16347,15 +16461,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr "Športové zariadenie"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "Štadión"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr "Upraviť štadión"
@@ -16369,6 +16483,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "vyberte šport:"
@@ -16391,4 +16505,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -16449,5 +16571,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16457,5 +16587,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16601,5 +16731,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16705,5 +16835,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16744,29 +16874,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr "šport"
@@ -16776,68 +16907,68 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr "lukostreľba"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr "atletika"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr "bejzbal"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr "basketbal"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr "boules (spoločný názov pre hry hrajuce sa s kovovými guľami)"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr ""
 "bowls (gúľanie šišatej gule po umelej,alebo prírodnej tráve k malej guľke)"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr "kanoe"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr "lezenie"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr ""
 "kriketová tréningová plocha s ochrannými sieťami (pre pálkára a nadhadzovača)"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr ""
@@ -16845,162 +16976,162 @@
 "trávnika)"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr "bicyklovanie"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr "závody chrtov"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr "jazdectvo"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr "americký futbal"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr "gymnastika"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr "konské dostihy"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr "automobilový"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr "racquetbal (podobné ako squash, iné pravidlá)"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr "ragby"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr "streľba"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr "korčuľovanie"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr "lyžovanie"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "futbal (soccer)"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr "plávanie"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "stolný tenis"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr "Športové centrum"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr "Upraviť športové centrum"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr "Hracia plocha, ihrisko"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr "Upraviť hraciu plochu, ihrisko"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr "Dostihová dráha"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr "Upraviť dostihovú dráhu"
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr "Golfové ihrisko"
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr "Upraviť golfové ihrisko"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr "Upraviť minigolf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr "Šport"
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr "Multi"
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr "Upraviť Multi"
@@ -17039,191 +17170,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr "hracia plocha, ihrisko"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr "športové centrum"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr "štadión"
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr "10pin (Kolok na hru s desiatimi kolkami)"
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr "Upraviť 10pin (kolok na hru s desiatimi kolkami)"
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr "Atletika"
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr "Upraviť atletiku"
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr "Lukostreľba"
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr "Upraviť lukostreľbu"
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr "Lezenie"
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr "Upraviť lezenie"
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr "Kanoistika"
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr "Upraviť kanoistiku"
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr "Cyklistika"
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr "Upraviť cyklistiku"
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr "Preteky chrtov"
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr "Upraviť preteky chrtov"
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr "Jazdectvo"
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr "Upraviť jazdectvo"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr "Konské dostihy"
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr "Upraviť konské dostihy"
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr "Gymnastika"
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr "Upraviť turistiku"
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr "Motošport"
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr "Upraviť motošport"
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr "Korčuľovanie"
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr "Upraviť korčuľovanie"
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr "Upraviť Skateboard"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr "Plávanie"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr "Upraviť plávanie"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr "Lýžovanie"
@@ -17231,56 +17362,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr "Upraviť lyžovanie"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr "Typ lyžiarskej dráhy"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr "zjazdárska"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr "beh nalyžiach hore kopcom (nordic)"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr "park zimných športov"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr "Obtiažnosť"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr "pre začiatočníkov"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr "ľahká"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr "stredne pokročilý (intermediate)"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr "pokročilý (advanced)"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr "pre skúsených"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr "freeride (zjazd na horských bicykloch cez prekážky)"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr "Streľba"
@@ -17288,178 +17419,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr "Upraviť streľbu"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr "Šport (loptový)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr "Futbal"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr "Upraviť futbal"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr "Americký futbal"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr "Upraviť americký futbal"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr "Upraviť Australian Football"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr "Bejzbal"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr "Upraviť bejzbal"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr "Basketbal"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr "Upraviť basketbal"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr "Upraviť golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr "golfové ihrisko"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr "Bowling na tráve"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr "Upraviť bowling na tráve"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr "Upraviť bowling"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr "Upraviť kriket"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr "Cvičné ihrisko pre kriket so sieťou"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr "Upraviť cvičné ihrisko pre kriket so sieťou"
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr "Upraviť kroquet"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr "Upraviť hokej"
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr "Upraviť polotu"
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr "Racquetbal"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr "Upraviť racquetbal"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr "Ragby"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr "Upraviť ragby"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr "Stolný tenis"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr "Upraviť stolný tenis"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr "Upraviť tenis"
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "Budovy, stavby"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr "Budova"
@@ -17467,5 +17598,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "Verejná budova"
@@ -17473,10 +17604,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr "Upraviť verejnú budovu"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "Radnica (obecný úrad)"
@@ -17484,10 +17615,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "Upraviť radnicu (obecný úrad)"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "Veľvyslanectvo"
@@ -17495,10 +17626,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "Upraviť veľvyslanectvo"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "Súd"
@@ -17507,10 +17638,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "Upraviť súd"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "Vezenie"
@@ -17519,10 +17650,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "Upraviť súd"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "Polícia"
@@ -17532,10 +17663,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "Upraviť políciu"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "Hasičská stanica"
@@ -17544,10 +17675,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "Upraviť hasičskú stanicu"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "Pošta"
@@ -17555,5 +17686,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr "Upraviť poštu"
@@ -17561,15 +17692,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr "Škôlka"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr "Upraviť škôlku"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "Škola"
@@ -17577,10 +17708,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "Upraviť školu"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr "Univerzita"
@@ -17588,10 +17719,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr "Upraviť Univerzitu"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr "Vysoká škola"
@@ -17599,5 +17730,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr "Upraviť vysokú školu"
@@ -17605,5 +17736,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "Kino"
@@ -17612,10 +17743,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "Upraviť kino"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "Knižnica"
@@ -17624,10 +17755,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "Upraviť knižnicu"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr "Kultúrne stredisko"
@@ -17635,10 +17766,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr "Upraviť kultúrne stredisko"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "Divadlo"
@@ -17647,10 +17778,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "Upraviť divadlo"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr "Kostol"
@@ -17660,5 +17791,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr "Upraviť kostol"
@@ -17667,6 +17798,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr "Náboženstvo"
@@ -17675,66 +17806,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr "baháisti"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr "budhisti"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr "kresťania"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr "hinduisti"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr "džinisti"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr "judaisti"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr "moslimovia"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr "spiritualisti"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr "taoisti"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr "unitársky"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr "Vyznanie (cirkevné)"
@@ -17743,81 +17874,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr "anglikánska"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr "baptistická"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr "katolícka"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr "evanjelikánska"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr "svedkovia jehovovi"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr "lutheránska"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr "methodistická"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr "mormónska"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr "orthodoxná"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr "presbiteriánska"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr "protestanská"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr "quakerská"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr "šiítska"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr "sunnitská"
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr "Adresy"
@@ -17826,5 +17957,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr "Upraviť informácie o adrese"
@@ -17832,5 +17963,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr "Číslo domu"
@@ -17838,20 +17969,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr "Meno domu"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr "Názov mesta"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "Poštové smerovacie číslo"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr "Kód krajiny"
@@ -17859,5 +17990,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr "Interpolácia adries"
@@ -17866,5 +17997,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr "Upraviť interpoláciu adries"
@@ -17872,71 +18003,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr "Schéma číslovania"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr "nepárne"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr "párne"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr "všetky"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr "abecedný"
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr "Človekom vytvorené (Man made)"
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr "Závody (továrne)"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr "Upraviť závody (továrne)"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "Veža"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "Upraviť vežu"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "Vodojem"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "Upraviť vodojem"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr "Plynojem (Gasometer)"
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr "Upraviť plynojem (gasometer)"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "Maják"
@@ -17944,10 +18075,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "Upraviť maják"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "Veterný mlyn"
@@ -17955,10 +18086,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "Upraviť veterný mlyn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "Potrubie"
@@ -17966,10 +18097,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "Upraviť potrubie"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr "Čistička odpadových vôd"
@@ -17979,10 +18110,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr "Upraviť čističku odpadových vôd"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr "Žeriav"
@@ -17990,10 +18121,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr "Upraviť žeriav"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr "Signál (rádiomaják)"
@@ -18001,10 +18132,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr "Upraviť signál (rádiomaják)"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr "Meračský bod"
@@ -18012,10 +18143,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr "Upraviť meračský bod"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr "Pozorovanie (ostraha)"
@@ -18023,5 +18154,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr "Upraviť pozorovaciu kameru"
@@ -18029,5 +18160,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr "Elektráreň (spôsob vyroby)"
@@ -18037,39 +18168,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr "Upraviť elektráreň (spôsob vyroby)"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr "veterná"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr "vodná"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr "fosílna"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr "jadrová"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr "uhoľná"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr "fotovoltanická (slnečná články)"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr "plynová"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr "Transformátorová stanica"
@@ -18078,10 +18209,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr "Upraviť trafostanicu"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr "Malý transformátor"
@@ -18090,5 +18221,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr "Upraviť malý transformátor"
@@ -18096,10 +18227,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr "Odkazová linka"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr "Elektrický stožiar (vysoké napätie)"
@@ -18110,5 +18241,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr "Upraviť elektrický stožiar"
@@ -18116,5 +18247,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr "Elektrické vedenie"
@@ -18123,25 +18254,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr "Upraviť elektrické vedenie"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr "Napätie"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr "Počet vodičov"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr "Vybavenosť (Amenities)"
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "Toalety"
@@ -18149,20 +18280,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr "Referenčné číslo"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr "Poznámka"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr "Poštová schránka"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "Telefón"
@@ -18171,5 +18302,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr "Upraviť telefón"
@@ -18177,5 +18308,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "Mince"
@@ -18183,5 +18314,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr "Bankovky"
@@ -18189,5 +18320,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr "Platobné karty a Kreditné karty"
@@ -18195,5 +18326,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr "Debetné karty"
@@ -18201,15 +18332,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "Kreditné karty"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "Telefónne karty"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr "Recyklácia"
@@ -18218,5 +18349,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr "Upraviť recykláciu (zber)"
@@ -18224,35 +18355,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr "Batérie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr "Plechovky"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr "Handry"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr "Sklo"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr "Železný šrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr "Lavička"
@@ -18261,20 +18392,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr "Poľovnícky posed"
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr "Upraviť poľovnícky posed"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr "Skryť"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr "Zamknúť"
@@ -18282,22 +18413,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr "Výška"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr "nízky"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr "polovičný"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr "úplný"
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr "Fontána"
@@ -18306,10 +18437,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr "Upraviť fontánu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "Pitná voda"
@@ -18318,10 +18449,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "Upraviť pitnú vodu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr "Hniezdo záchrany"
@@ -18329,25 +18460,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr "Upraviť hniezdo záchrany"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "Obchody"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr "Upraviť supermarket"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr "Obchod s polotovarmi"
@@ -18355,10 +18486,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr "Upraviť obchod s polotovarmi"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr "Stánok"
@@ -18366,10 +18497,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr "Upraviť stánok"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "Predajný automat"
@@ -18377,5 +18508,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "Upraviť predajný automat"
@@ -18383,88 +18514,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "Predávané výrobky"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr "lístky MHD"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr "plány MHD"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr "parkovacie lístky"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr "jedlo"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "pitie"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr "sladkosti"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr "cigarety"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr "fotky"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr "krmivo pre zvieratá"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "noviny"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "hračky"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr "známky"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "SIM-karty"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr "telefónne kupóny (poukážky)"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr "kupóny (poukážky)"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr "kondómy"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr "tampóny"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr "sáčky na výkaly"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr "Prístupové alebo vernostné karty"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "Mäsiareň"
@@ -18472,10 +18603,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "Upraviť mäsiarstvo"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "Chlieb a pečivo"
@@ -18483,10 +18614,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "Upraviť chlieb a pečivo"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr "Kvetinárstvo"
@@ -18494,20 +18625,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr "Upraviť kvetinárstvo"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr "Biopotraviny"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr "Upraviť biopotraviny"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -18515,60 +18646,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr "Upraviť Obchod s alkoholickými nápojmi"
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr "Nápoje"
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr "Upraviť Obchod s nápojmi."
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr "Počítač"
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr "Upraviť počítačový obchod"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr "Elektronika"
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr "Upraviť obchod s elektronikou"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr "Upraviť obchod s Hifi elektronikou"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr "Nábytok"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr "Upraviť obchod s nábytkom"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr "Záhradné centrum"
@@ -18576,10 +18707,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr "Upraviť záhradné centrum"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr "Železiarstvo"
@@ -18587,10 +18718,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr "Upraviť železiarstvo"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr "Obchod Urob si sám"
@@ -18598,60 +18729,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr "Upraviť obchod Urob si sám"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr "Papierníctvo"
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr "Upraviť papierníctvo"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr "Kaderníctvo"
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr "Upraviť kaderníctvo"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr "Obuva"
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr "Upravit obchod s obuvou"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr "Hračky"
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr "Upraviť obchod s hračkami"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr "Obchod s DVD"
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr "Upraviť obchod s DVD"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "Chemická čistiareň"
@@ -18659,10 +18790,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "Upraviť chemickú čistiareň"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "Práčovňa"
@@ -18670,10 +18801,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "Upraviť práčovňu"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr "Turistický (Outdoor)"
@@ -18681,35 +18812,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr "Upraviť obchod s výchádzkovým (outdoor) tovarom"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr "Športy"
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr "Upraviť športový obchod"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr "Optik"
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr "Upraviť očnú optiku"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "Hotovosť"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "Banka"
@@ -18717,5 +18848,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "Upraviť banku"
@@ -18723,10 +18854,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr "Zmenáreň"
@@ -18734,5 +18865,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr "Upraviť zmenáreň"
@@ -18740,15 +18871,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "Upraviť bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "Zdravie"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr "Lekári"
@@ -18756,20 +18887,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr "Upraviť lekárov"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr "Zubný lekár"
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr "Upraviť zubného lekára"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "Lekáreň"
@@ -18777,5 +18908,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "Upraviť lekáreň"
@@ -18783,10 +18914,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr "výdaj na recepty"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "Nemocnica"
@@ -18794,10 +18925,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "Upraviť nemocnicu"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr "Pohotovosť (Záchranná služba)"
@@ -18806,5 +18937,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr "Upraviť pohotovosť (záchrannú službu)"
@@ -18813,20 +18944,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr "Číslo bodu"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr "Meno bodu(miesta)"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr "Telefónne číslo"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Použite medzinárodný kód, ako +12-345-67890)"
@@ -18834,5 +18965,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr "Veterinár"
@@ -18841,56 +18972,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr "Upraviť veterinárnu ambulanciu"
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr "Upraviť kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr "Krajina (štát)"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr "Upraviť krajinu (štát)"
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr "Stav"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr "Upraviť štát"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr "Oblasť (región)"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr "Upraviť oblasť (región)"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr "kraj (okres)"
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr "Upraviť kraj (okres)"
@@ -18898,15 +19028,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr "Mesto (city)"
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr "Upraviť mesto"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr "Mesto (town)"
@@ -18914,10 +19044,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr "Upraviť mesto"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr "Štvrť"
@@ -18925,25 +19055,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr "Upraviť štvrť"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "Dedina"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "Upraviť dedinu"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr "Malá dedina / osada / samota"
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr "Upraviť malú dedinu"
@@ -18951,5 +19081,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr "Oblasť (lokalita)"
@@ -18957,10 +19087,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr "Upraviť oblasť (lokalitu)"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "Ostrov"
@@ -18968,5 +19098,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "Upraviť Ostrov"
@@ -18974,5 +19104,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr "Vstup do jaskyne"
@@ -18980,10 +19110,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr "Upraviť vstup do jaskyne"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "Vrchol"
@@ -18991,10 +19121,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "Upraviť vrchol kopca"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr "Ľadovec"
@@ -19002,10 +19132,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr "Upraviť ľadovec"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr "Sopka"
@@ -19013,70 +19143,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr "Upraviť sopku"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr "Hranice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr "Štátna"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr "Upraviť štátne hranice"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr "Administratívne"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr "Upraviť administratívne hranice"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr "Občianske"
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr "Upraviť občiansku hranicu"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr "Politická"
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr "Upraviť politickú hranicu"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr "Národný park"
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr "Upraviť hranicu Národného parku (prírodnej rezervácie)"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr "Využívanie oblasti (Land use)"
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "Strom"
@@ -19085,15 +19215,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "Upraviť strom"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr "Botanický názov"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr "Drevo"
@@ -19102,5 +19232,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr "Upraviť Drevo"
@@ -19108,17 +19238,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr "ihličnatý"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr "listnatý"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr "zmiešaný"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "Les"
@@ -19127,14 +19257,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr "Upraviť les"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr "Prírodná rezervácia"
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr "Upraviť prírodnú rezerváciu"
@@ -19142,25 +19272,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr "Sutina"
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr "Upraviť sutinu"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr "Krovie"
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr "Upraviť krovie"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr "Fell (typ horskej krajiny nad pásmom stromov (horská pastvina))"
@@ -19168,5 +19298,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr ""
@@ -19174,5 +19304,5 @@
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr "Vresovisko"
@@ -19180,5 +19310,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr "Upraviť vresovisko"
@@ -19186,5 +19316,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr "Farma"
@@ -19193,45 +19323,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr "Upraviť farmu"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr "Poľnohospodárska pôda"
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr "Upraviť poľnohospodárske pôdu"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr "Lúka"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr "Upraviť lúku"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr "Vinica"
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr "Upraviť vinicu"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr "Ťažobný priestor"
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr "Upraviť ťažobný priestor"
@@ -19239,25 +19369,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr "Záhrada"
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr "Upraviť záhradu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr "Tráva"
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr "Upraviť trávnatú plochu"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr "Obecná zeleň"
@@ -19265,10 +19395,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr "Upraviť obecnú zeleň"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr "Spoločné, obecné"
@@ -19276,20 +19406,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr "Upraviť spoločné, obecné"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr "Upraviť park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr "Rekreačná oblasť"
@@ -19297,5 +19427,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr "Upraviť rekreačnú oblasť"
@@ -19303,15 +19433,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr "Osídlená oblasť (Residential area)"
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr "Upraviť osídlenú oblasť"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr "Cintorín (malý, blizko kostola)"
@@ -19319,9 +19449,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr "Upraviť cintorín (malý, blizko kostola)"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr "Cintorín"
@@ -19329,39 +19459,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr "Upraviť cintorín"
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr "Maloobchod"
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr "Upraviť oblasť s maloobchodmi"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr "Obchodná (komerčná)"
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr "Upraviť obchodnú (komerčnú) oblasť"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr "Priemysel"
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr "Upraviť priemyselnú oblasť"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr "Železničný pozemok"
@@ -19369,15 +19499,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr "Upraviť železničný pozemok"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr "Armáda"
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr "Upraviť vojenskú oblasť"
@@ -19385,55 +19515,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr "Stavebná oblasť"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr "Upraviť stavebnú oblasť"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr "Brownfield (opustený priemyselný objekt)"
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr "Upraviť brownfield (opustený priemyselný objekt)"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr "Greenfield (oblasť používaná pre poľnohospodárstvo)"
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr "Upraviť greenfield (oblasť používaná pre poľnohospodárstvo)"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr "Skládka odpadov"
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr "Upraviť skládku odpadov"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr "Lom"
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr "Upraviť lom"
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr "multipolygón"
@@ -19443,5 +19573,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr "Upraviť multipolygón"
@@ -19450,10 +19580,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr "obvodová časť (outer segment)"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr "vnútorná časť (inner segment)"
@@ -19461,5 +19591,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr "Prikázané smery jazdy (turn restriction)"
@@ -19468,5 +19598,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr "Upraviť prikázané smery jazdy (turn restriction)"
@@ -19474,34 +19604,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr "Obmedzenie"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr "zákaz zabočenia vľavo"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr "zákaz zabočenia vpravo"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr "zákaz jazdy priamo"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr "zákaz otáčania sa"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr "prikázané odbočenie vpravo"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr "prikázané odbočenie vľavo"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr "zákaz odbočenia"
@@ -19510,15 +19640,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr "z cesty"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr "cez bod alebo cestu"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr "k ceste"
@@ -19526,5 +19656,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr "Cesta (Route)"
@@ -19533,5 +19663,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr "Upraviť Cestu (Route)"
@@ -19539,5 +19669,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr "Typ Cesty (Route)"
@@ -19609,24 +19739,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr "bicykel"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr "cesta (vozovka)"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr "trajekt (prievoz)"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr "lyžovanie"
@@ -19679,20 +19809,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr "pešia (foot)"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr "turistika"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr "električka"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr "obchádzka"
@@ -19706,10 +19836,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr "metro (subway)"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr "Popis značky"
@@ -19717,26 +19847,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr "Sieť"
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "Typ Cesty (Route)"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr "plánovaný"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr "náhradný"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr "dočasný"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr "spojenie"
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr "Farba (hex)"
@@ -19745,30 +19881,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr "cestný úsek"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr "predný segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr "zadný segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr "bod prerušenia"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr "predný bod prerušenia"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr "zadný bod prerušenia"
@@ -19804,6 +19940,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19819,5 +19956,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19836,5 +19981,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr "štandartný"
@@ -19928,7 +20073,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr "most"
@@ -20193,15 +20338,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr "zastaralý"
@@ -20243,5 +20388,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr "koňská (horse)"
@@ -20379,4 +20524,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20388,5 +20539,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20394,5 +20545,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20429,5 +20580,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20451,11 +20602,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr "prekážka"
@@ -20479,5 +20630,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20518,7 +20669,7 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
-msgstr ""
+msgstr "cesta pre motorové vozidlá"
 
 #. color tertiary
@@ -20554,6 +20705,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr "ulica"
@@ -20609,7 +20760,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr "cesta (highway_track)"
@@ -20662,11 +20813,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr "koľajnica (rail)"
@@ -20687,5 +20846,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr "služby"
@@ -20699,5 +20858,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr "brod"
@@ -20718,5 +20877,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr "turningcircle (zaokrúhlený koniec cesty pre ľahšie otáčanie sa aut)"
@@ -20730,6 +20889,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr "miesto pohotovostnej prvej pomoci"
@@ -20744,5 +20903,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr "riečny breh"
@@ -20756,5 +20915,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr "potok"
@@ -20768,5 +20927,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr "dok (nakladacia rampa)"
@@ -20794,5 +20953,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr "akvadukt"
@@ -20935,5 +21094,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20960,13 +21119,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr "človekom vytvorené (manmade)"
@@ -21028,7 +21187,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr "železničná výhybka"
@@ -21051,10 +21210,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr "iná koľaj"
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr "nadchod nad železnicou"
@@ -21090,7 +21249,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr "historická železnica(turistická)"
@@ -21135,6 +21294,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr "letecké cesty"
@@ -21148,5 +21307,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr "terminál"
@@ -21168,5 +21327,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr "zjazdovka_čierna"
@@ -21180,5 +21339,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr "zjazdovka_ľahká"
@@ -21186,4 +21345,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21226,7 +21392,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr "Visuté cesty/Lanovky"
@@ -21243,5 +21409,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr "mierna zjazdovka (piste_easy)"
@@ -21256,5 +21422,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr "stredne ťažká zjazdovka (piste_intermediate)"
@@ -21269,5 +21435,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr "zjazdovka pre pokročilých (piste_advanced)"
@@ -21282,5 +21448,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr "zjazdovka pre expertov (piste_expert)"
@@ -21295,5 +21461,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr "zjazdovka pre freeride (piste_freeride)"
@@ -21308,5 +21474,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr "zjazdovka pre začiatočníkov (piste_novice)"
@@ -21329,4 +21495,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -21337,4 +21510,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -21411,10 +21592,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr "energia (power)"
@@ -21428,5 +21610,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr "hrádza (pier)"
@@ -21440,5 +21622,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr "potrubie (pipeline)"
@@ -21566,12 +21748,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr "oddych (leisure)"
@@ -21585,5 +21767,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr "prístav (marina)"
@@ -21655,8 +21837,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr "zaujímavosti (amenity)"
@@ -21758,10 +21940,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr "verejná_doprava"
@@ -21781,4 +21963,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21800,4 +21989,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -22121,4 +22317,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -22145,24 +22349,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr "svetelné zariadenie"
@@ -22194,6 +22406,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr "osvetlená_voda (light_water)"
@@ -22254,8 +22466,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr "zdravie"
@@ -22608,26 +22820,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr "obchod"
@@ -22682,5 +22894,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22699,8 +22911,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr "hotel"
@@ -22850,9 +23062,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr "cestovanie"
@@ -22924,8 +23136,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr "historické"
@@ -22996,8 +23208,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr "zelená"
@@ -23011,5 +23223,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr "lom"
@@ -23023,5 +23235,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr "skládka odpadov (landfill)"
@@ -23043,5 +23255,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr "(basin) kotvisko pre lode s udržiavanou výškou hladiny vody"
@@ -23055,5 +23267,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr "les"
@@ -23067,5 +23279,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr "farmy"
@@ -23088,5 +23300,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr "maloobchody"
@@ -23100,5 +23312,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr "závody"
@@ -23112,5 +23324,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr "brownfield (opustený priemyselný objekt)"
@@ -23124,5 +23336,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr "greenfield (oblasť používaná pre poľnohospodárstvo)"
@@ -23136,5 +23348,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr "železničný pozemok"
@@ -23191,7 +23403,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr "armáda"
@@ -23205,5 +23417,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr "cintorín (cemetery)"
@@ -23216,5 +23428,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr "vrchol (peak)"
@@ -23229,5 +23441,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr "ľadovec (glacier)"
@@ -23241,5 +23453,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr "sopka"
@@ -23294,8 +23506,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr "prírodné (natural)"
@@ -23309,5 +23521,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr "oblasť pokrytá krovím"
@@ -23321,5 +23533,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr "vresovisko"
@@ -23333,5 +23545,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr "drevo (wood)"
@@ -23345,5 +23557,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr "blato (mud)"
@@ -23357,5 +23569,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr "pláž (beach)"
@@ -23433,8 +23645,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr "trasa (route)"
@@ -23482,7 +23694,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr "hranica (boundary)"
@@ -23624,10 +23836,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr "miesto"
@@ -23675,6 +23887,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr "adresa"
@@ -23971,28 +24183,6 @@
 msgstr "Terraserver Urban"
 
-#~ msgid ""
-#~ "Failed to access system property ''{0}'' for security reasons. Exception "
-#~ "was: {1}"
-#~ msgstr ""
-#~ "Neúspešný  prístup k systémovej vlastnosti ''{0}'' z bezpečnostného "
-#~ "dôvodu. Výnimka bola: {1}"
-
-#~ msgid "Unknown file extension for file ''{0}''"
-#~ msgstr "Neznáme rozšírenie súboru pre súbor ''{0}''"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Neznáma prípona súboru"
-
 #~ msgid "Move"
 #~ msgstr "Presunúť"
-
-#~ msgid "Invalid projection"
-#~ msgstr "Chybná projekcia"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Najskôr zmente projekciu na {0}."
-
-#~ msgid "end"
-#~ msgstr "koniec (end)"
 
 #~ msgid "Not implemented yet."
@@ -24074,4 +24264,7 @@
 #~ msgstr "Vrstvy: {0}"
 
+#~ msgid "Unknown file extension."
+#~ msgstr "Neznáma prípona súboru"
+
 #~ msgid "Login name (email) to the OSM account."
 #~ msgstr "Prihlasovacie meno (email) k OSM účtu."
@@ -24118,4 +24311,7 @@
 #~ msgid "Adjust the position of the WMS layer"
 #~ msgstr "Upraviť pozíciu WMS vrstvy"
+
+#~ msgid "end"
+#~ msgstr "koniec (end)"
 
 #~ msgid "Open the OpenStreetBugs window and activate the automatic download"
@@ -24345,4 +24541,10 @@
 #~ "si pokračovať?"
 
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Najskôr zmente projekciu na {0}."
+
+#~ msgid "Invalid projection"
+#~ msgstr "Chybná projekcia"
+
 #~ msgid ""
 #~ "An error occured while trying to match the photos to the GPX track. You "
@@ -24566,2 +24768,12 @@
 #~ msgid "Conflict created"
 #~ msgstr "Konflikt je vytvorený"
+
+#~ msgid ""
+#~ "Failed to access system property ''{0}'' for security reasons. Exception "
+#~ "was: {1}"
+#~ msgstr ""
+#~ "Neúspešný  prístup k systémovej vlastnosti ''{0}'' z bezpečnostného "
+#~ "dôvodu. Výnimka bola: {1}"
+
+#~ msgid "Unknown file extension for file ''{0}''"
+#~ msgstr "Neznáme rozšírenie súboru pre súbor ''{0}''"
Index: /applications/editors/josm/i18n/po/sl.po
===================================================================
--- /applications/editors/josm/i18n/po/sl.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/sl.po	(revision 17069)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
-"PO-Revision-Date: 2009-08-04 10:40+0000\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
+"PO-Revision-Date: 2009-08-10 13:39+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -17,5 +17,5 @@
 "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: 2009-08-10 11:58+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -57,6 +57,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -66,5 +66,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -101,6 +101,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "Napaka"
@@ -113,5 +113,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "Neshranjene spremembe"
@@ -131,10 +131,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -151,15 +151,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -189,6 +189,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -218,5 +218,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -372,5 +372,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
 msgstr ""
@@ -454,9 +454,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -489,7 +489,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -570,37 +570,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "podatke"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "plast"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "izbor"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "sprejem"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Povečava na {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Povečava pogleda na {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -610,30 +610,30 @@
 msgstr "Pogled: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "Združi poti"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "Združi več poti v eno samo."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr "Združim poti z različnim članstvom?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -641,13 +641,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "Obrnem smeri?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -655,10 +655,10 @@
 msgstr "Poti v trenutnih smereh ni mogoče združiti. Obrnem nekatere od njih?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "Obrni in združi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -666,20 +666,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Razreši neskladja"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Združi {0} poti"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "Vse poti so bile prazne"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -724,6 +724,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -745,6 +745,6 @@
 msgstr "Izbriši izbrane predmete."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -754,5 +754,5 @@
 msgstr "Prepiši"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -884,7 +884,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "Izvoz v datoteko oblike GPX."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -900,5 +899,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -916,5 +915,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -986,22 +985,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "Združi vozlišča"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "Združi vozlišča v najstarejšega"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "Izberite vsaj dve vozlišči za združitev"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1009,13 +1008,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "Vseeno združi"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "Ne morem združiti vozlišč: Moral bi izbrisati pot, ki je še v rabi."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1269,7 +1268,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "Dokument ni odprt, zato ni kaj shraniti."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1855,5 +1853,5 @@
 msgstr "Napake pri sprejemu"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1865,5 +1863,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr ""
@@ -1900,11 +1898,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2044,5 +2042,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2118,5 +2116,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Iskanje predmetov."
@@ -2240,5 +2238,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Iskanje"
@@ -2438,5 +2436,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2479,5 +2477,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr ""
@@ -2514,11 +2512,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "Združi {0} vozlišč"
-msgstr[1] "Združi {0} vozlišč"
-msgstr[2] "Združi {0} vozlišč"
-msgstr[3] "Združi {0} vozlišč"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2554,11 +2550,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "Zasuči {0} {1}"
-msgstr[1] "Zasuči {0} {1}"
-msgstr[2] "Zasuči {0} {1}"
-msgstr[3] "Zasuči {0} {1}"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2720,7 +2714,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "Spremeni {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2730,5 +2724,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2779,5 +2773,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2812,5 +2806,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2826,5 +2820,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "železnica"
@@ -2839,5 +2833,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3118,5 +3112,5 @@
 msgstr "Ne prikaži več"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3125,5 +3119,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3133,10 +3127,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3144,25 +3138,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "neznan"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3172,9 +3166,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3183,9 +3177,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "Nepričakovana napaka"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3195,9 +3201,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "Neznan gostitelj"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3207,5 +3213,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr ""
@@ -3289,10 +3295,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "Uporabniško ime"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "Geslo"
@@ -3494,15 +3500,15 @@
 msgstr "(ni predmeta)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "plasti ni na seznamu."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3556,5 +3562,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr ""
@@ -3563,5 +3569,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr ""
@@ -3570,20 +3576,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Lastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3593,6 +3599,6 @@
 msgstr "Oznake"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3600,6 +3606,6 @@
 msgstr "Vozlišča"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3607,40 +3613,40 @@
 msgstr "Člani"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3648,74 +3654,74 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "Odpravljanje sporov"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3723,30 +3729,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3754,5 +3760,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3760,13 +3766,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3774,5 +3780,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3780,21 +3786,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr "Gor"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr "Premakni izbrani element za eno mesto višje"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr "Dol"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr "Premakni izbrani element za eno mesto nižje"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3803,27 +3809,27 @@
 msgstr "Odstrani"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr "Zamrzni"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr "Odmrzni"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3831,5 +3837,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3838,5 +3844,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3845,5 +3851,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3852,5 +3858,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -3859,21 +3865,21 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -3883,5 +3889,5 @@
 msgstr "parameter '{0}' ne sme biti ničen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -3891,5 +3897,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -3897,19 +3903,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr "Vozlišče"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -3918,19 +3924,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -3939,9 +3945,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -3951,13 +3957,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -3965,90 +3971,90 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "izbrisano"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4058,17 +4064,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4077,14 +4083,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4092,21 +4098,21 @@
 msgstr "Vloga"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4114,14 +4120,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4129,7 +4135,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4141,7 +4147,7 @@
 msgstr "Ključ"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4154,45 +4160,45 @@
 msgstr "Vrednost"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr ""
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4212,8 +4218,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4250,5 +4256,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4350,83 +4356,83 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "Plasti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "Odpri seznam vseh naloženih plasti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "Izbriši izbrano plast."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "Prikaži/skrij"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "Preklopi vidljivost izbrane plasti."
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "Pomakni izbrano plast vrstico višje."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "Pomakni izbrano plast vrstico nižje."
@@ -4436,6 +4442,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4446,22 +4452,22 @@
 msgstr[3] "Spremenili boste do {0} predmete."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "Prazna vrednost izbriše ključ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<različno>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "Sprememba vrednosti?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4469,5 +4475,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4478,40 +4484,40 @@
 msgstr[3] "Spremeni lastnosti do {0} predmetov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "Izberite ključ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "Izberite vrednost"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "Lastnosti/Članstva"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "Lastnosti izbranih predmetov"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4528,39 +4534,39 @@
 msgstr "Dodaj"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 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/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 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/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Latnosti: {0} / Članstva: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "Lastnosti / Članstva"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "Spremeni relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, 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/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "Izbriši izbrani ključ vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr ""
@@ -4572,5 +4578,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "Relacije"
@@ -4602,31 +4608,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "Trenutni izbor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "Odpri okno s seznamom izbora"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "Povečava na izbrane predmete"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "Osveži seznam izbora."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "Povečava na ves izbor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4634,5 +4640,5 @@
 msgstr "Izbor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4641,5 +4647,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4648,5 +4654,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -4856,7 +4862,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "Izbriši izbrano relacijo"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -4939,5 +4944,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5178,5 +5183,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "Kraji"
@@ -5223,21 +5228,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "vrsta"
@@ -6037,149 +6042,149 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
-#: build/trans_presets.java:1856 build/trans_presets.java:1862
-#: build/trans_presets.java:1868 build/trans_presets.java:1874
-#: build/trans_presets.java:1880 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1898
-#: build/trans_presets.java:1904 build/trans_presets.java:1910
-#: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2012
-#: build/trans_presets.java:2018 build/trans_presets.java:2024
-#: build/trans_presets.java:2030 build/trans_presets.java:2036
-#: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
 #: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
 msgid "Name"
 msgstr "Naziv"
@@ -6273,5 +6278,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -6309,5 +6314,5 @@
 msgstr "Vpisanega časa ni bilo mogoče razpoznati."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -6315,30 +6320,30 @@
 msgstr "točka GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Riši povezave med točkami na tej plasti."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Ne riši povezav med točkami na tej plasti."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
@@ -6346,5 +6351,5 @@
 msgstr "Prilagodi barvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -6353,5 +6358,5 @@
 msgstr "Privzeto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
@@ -6360,31 +6365,31 @@
 msgstr "Izberite barvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
 msgid "Import Audio"
 msgstr "Uvozi zvok"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
 msgid "Wave Audio files (*.wav)"
 msgstr "Zvočne datoteke (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
 msgid "Import images"
 msgstr "Uvozi slike"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
 #, java-format
 msgid "{0} track, "
@@ -6393,5 +6398,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
 #, java-format
 msgid "{0} route, "
@@ -6400,5 +6405,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
 #, java-format
 msgid "{0} waypoint"
@@ -6407,10 +6412,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
 #, java-format
 msgid "Name: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
 #, java-format
@@ -6418,18 +6423,18 @@
 msgstr "Opis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
 msgid "Timespan: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 msgid "Length: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Pretvori v podatkovno plast"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid ""
@@ -6438,10 +6443,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
@@ -6452,29 +6457,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
 msgid "Download from OSM along this track"
 msgstr "Sprejmi iz OSM vzdolž te sledi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
 msgid "Download everything within:"
 msgstr "Sprejmi vse znotraj:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
 #, java-format
 msgid "{0} meters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
 #, java-format
 msgid "{0} sq km"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
 #, java-format
 msgid ""
@@ -6485,9 +6490,9 @@
 "nadaljevati?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -6495,5 +6500,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -6544,21 +6549,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -6936,5 +6941,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "Avtomobil"
@@ -6951,16 +6956,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "Kolo"
@@ -6988,14 +6995,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr ""
@@ -7204,19 +7214,19 @@
 msgstr "Jezik"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr ""
@@ -7345,35 +7355,11 @@
 msgstr "Geslo na posredovalnem strežniku"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr "Geslo vašega računa pri OSM. Pustite prazno da se geslo ne shranjuje."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "Osnovni URL naslov strežnika"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "OSM geslo"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -7724,7 +7710,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "Ni bilo možno prebrati \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -7829,7 +7815,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "Neznana vloga ''{0}''."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -7987,22 +7973,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "Napačno uporabniško ime ali geslo."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Pozor: Geslo se prenaša nekriptirano"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "Shrani uporabniško ime in geslo (nekriptirano)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "Vnesite geslo"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr "Geslo vašega računa pri OSM. Pustite prazno da se geslo ne shranjuje."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "OSM geslo"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
 
@@ -8166,14 +8176,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "Spremeni vlogo člana relacije pri {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "Priprava podatkov OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr "Neveljaven id točke"
@@ -8621,5 +8631,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr "Opis"
@@ -9020,5 +9030,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr ""
@@ -9343,5 +9353,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -9877,7 +9887,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr ""
@@ -10051,7 +10061,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "brez"
+msgstr ""
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10607,7 +10616,7 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0} točk"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -10745,5 +10754,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr "Ime ceste"
@@ -11552,7 +11561,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr "zgradba"
@@ -11566,5 +11575,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr ""
@@ -11797,12 +11806,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "Prosim izberite vrstico za urejanje."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "Plast WMS"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
@@ -11815,7 +11822,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "Ni sprememb za pošiljanje."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -11826,61 +11832,61 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr "Samodejno sprejemanje"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr "Naloži vidne ploščice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr "Spremeni ločljivost"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr "Shrani plast WMS v datoteko"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr "Naloži plast WMS iz datoteke"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Nepodprta različica datoteke WMS; našel {0}, pričakoval {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr ""
@@ -12208,4 +12214,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12242,5 +12250,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr "Ceste"
@@ -12251,5 +12259,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Avtocesta"
@@ -12258,5 +12266,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr "Uredi avtocesto"
@@ -12283,8 +12291,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr ""
@@ -12325,21 +12333,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr "Plast"
@@ -12353,8 +12361,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr "Voznih pasov"
@@ -12372,15 +12380,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr "Najvišja hitrost (km/h)"
@@ -12417,16 +12425,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr "Enosmerna"
@@ -12468,19 +12476,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Most"
@@ -12516,19 +12524,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr "Predor"
@@ -12562,18 +12570,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr "Usek"
@@ -12607,18 +12615,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr "Nasip"
@@ -12626,5 +12634,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr "Avtocestni priključek"
@@ -12633,5 +12641,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr "Uredi avtocestni priključek"
@@ -12639,5 +12647,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr "Hitra cesta"
@@ -12646,5 +12654,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr "Uredi hitro cesto"
@@ -12654,6 +12662,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr ""
@@ -12661,5 +12669,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr "Priključek hitre ceste"
@@ -12668,5 +12676,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr "Uredi priključek hitre ceste"
@@ -12679,5 +12687,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Glavna cesta (1.,2. reda)"
@@ -12686,5 +12694,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr "Uredi glavna cesta (1.,2. reda)"
@@ -12692,10 +12700,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr "Priključek glavne ceste"
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr "Uredi priključek glavne ceste"
@@ -12707,5 +12715,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Regionalna cesta (1.,2. reda)"
@@ -12715,5 +12723,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr "Uredi regionalno cesto (1.,2. reda)"
@@ -12721,5 +12729,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr "Regionalna cesta (3. reda, turistična)"
@@ -12729,5 +12737,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr "Uredi regionalno cesto (3. reda, turistična)"
@@ -12739,5 +12747,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr ""
@@ -12747,5 +12755,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr ""
@@ -12772,19 +12780,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr ""
@@ -12796,5 +12804,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr ""
@@ -12803,5 +12811,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr ""
@@ -12825,13 +12833,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr "Površina"
@@ -12851,20 +12859,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr ""
@@ -12872,12 +12880,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr ""
@@ -12885,5 +12893,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr ""
@@ -12892,5 +12900,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr ""
@@ -12898,5 +12906,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr ""
@@ -12905,5 +12913,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr ""
@@ -12913,18 +12921,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr ""
@@ -12932,5 +12940,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr ""
@@ -12940,5 +12948,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -12946,5 +12954,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr "Cesta (neznana kategorija)"
@@ -12953,5 +12961,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr "Uredi cesto neznane kategorije"
@@ -12960,20 +12968,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr "Cestne omejitve"
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr "Uredi cestne omejitve"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr "Cestnina"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr "Brez izhoda (slepa ulica)"
@@ -12986,8 +12994,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr "Dostop"
@@ -13031,23 +13039,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr "da"
@@ -13060,40 +13068,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr ""
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr ""
@@ -13106,19 +13114,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr ""
@@ -13141,65 +13149,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr ""
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr ""
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -13214,10 +13222,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr ""
@@ -13233,13 +13241,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr ""
@@ -13255,30 +13263,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr ""
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr "Najnižja hitrost (km/h)"
@@ -13286,25 +13294,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr "Krožišče"
@@ -13315,5 +13323,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr ""
@@ -13335,9 +13343,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr "Vrsta"
@@ -13357,10 +13365,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr ""
@@ -13382,10 +13390,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr "hitra cesta"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr ""
@@ -13407,10 +13415,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr "glavna"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr ""
@@ -13432,6 +13440,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr "regionalna"
@@ -13445,9 +13453,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr "regionalna (turistična)"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr ""
@@ -13461,9 +13469,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr ""
@@ -13493,10 +13501,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr ""
@@ -13504,4 +13512,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13519,6 +13534,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr ""
@@ -13529,10 +13544,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr "Uredi most"
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr ""
@@ -13540,19 +13555,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr "Poti"
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr ""
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr ""
@@ -13568,5 +13583,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr "krožišče"
@@ -13575,5 +13590,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr ""
@@ -13581,5 +13596,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr ""
@@ -13587,5 +13602,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr "Kolesarska steza"
@@ -13595,5 +13610,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr "Uredi kolesarsko stezo"
@@ -13601,5 +13616,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr "Pešpot"
@@ -13608,5 +13623,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr "Uredi pešpot"
@@ -13614,5 +13629,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr ""
@@ -13621,5 +13636,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr ""
@@ -13627,5 +13642,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr "Stopnice"
@@ -13635,5 +13650,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr "Uredi stopnice"
@@ -13642,5 +13657,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr ""
@@ -13649,14 +13664,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr ""
@@ -13664,18 +13679,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr ""
@@ -13683,5 +13698,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr ""
@@ -13690,5 +13705,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr ""
@@ -13696,5 +13711,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr ""
@@ -13703,5 +13718,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr ""
@@ -13709,5 +13724,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr ""
@@ -13716,5 +13731,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr ""
@@ -13722,5 +13737,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr ""
@@ -13729,5 +13744,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr ""
@@ -13735,5 +13750,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr ""
@@ -13742,5 +13757,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -13749,5 +13764,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr "Steza"
@@ -13756,13 +13771,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr "Uredi stezo"
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr ""
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr ""
@@ -13770,5 +13785,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr ""
@@ -13778,5 +13793,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr ""
@@ -13784,5 +13799,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr ""
@@ -13792,5 +13807,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr ""
@@ -13798,5 +13813,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr ""
@@ -13806,5 +13821,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr ""
@@ -13812,5 +13827,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr ""
@@ -13820,5 +13835,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr ""
@@ -13826,5 +13841,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr ""
@@ -13834,5 +13849,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr ""
@@ -13840,5 +13855,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr ""
@@ -13848,5 +13863,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr ""
@@ -13854,10 +13869,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr "Avtocestno križišče"
@@ -13865,15 +13880,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr "Uredi avtocestno križišče"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr ""
@@ -13881,5 +13896,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr ""
@@ -13914,14 +13929,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr ""
@@ -13930,5 +13945,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr "Semafor"
@@ -13938,5 +13953,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -13945,27 +13960,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr ""
@@ -13973,6 +13988,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr ""
@@ -13981,11 +13996,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -13993,30 +14008,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr "Stop znak"
@@ -14024,5 +14039,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -14031,14 +14046,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr ""
@@ -14049,14 +14064,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr "Obračališče"
@@ -14066,20 +14081,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr "Znak za naselje"
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr "Uredi znak za naselje"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr ""
@@ -14087,5 +14102,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr ""
@@ -14093,5 +14108,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr ""
@@ -14099,5 +14114,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr ""
@@ -14106,10 +14121,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr ""
@@ -14117,5 +14132,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr "Gorski prelaz"
@@ -14123,5 +14138,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr "Uredi gorski prelaz"
@@ -14133,7 +14148,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr ""
@@ -14141,5 +14156,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr "Ovire"
@@ -14147,5 +14162,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr "Stebriček"
@@ -14153,5 +14168,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr ""
@@ -14190,18 +14205,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr ""
@@ -14210,5 +14229,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr ""
@@ -14216,5 +14235,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr "Rešetka za živino"
@@ -14222,10 +14241,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr ""
@@ -14233,15 +14252,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr "Cestninska postaja"
@@ -14249,5 +14268,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr "Uredi cestninsko postajo"
@@ -14255,10 +14274,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr ""
@@ -14268,5 +14287,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr ""
@@ -14275,5 +14294,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr ""
@@ -14282,5 +14301,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr ""
@@ -14288,5 +14307,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr ""
@@ -14295,5 +14314,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr ""
@@ -14305,15 +14324,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr "Vrata"
@@ -14321,50 +14340,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr ""
@@ -14372,15 +14391,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+#, fuzzy
+msgid "Turnstile"
+msgstr "Okretnica"
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "Uredi grad"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr ""
@@ -14391,10 +14422,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr "Voda"
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr "Izvir"
@@ -14402,5 +14433,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr "Uredi izvir"
@@ -14408,5 +14439,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr ""
@@ -14414,10 +14445,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr "Potok"
@@ -14425,10 +14456,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr "Uredi potok"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr "Kanal"
@@ -14436,10 +14467,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr "Uredi kanal"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr "Reka"
@@ -14449,5 +14480,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr "Uredi reko"
@@ -14455,15 +14486,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr "Uredi vodo"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr "Kopno"
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr "Uredi kopno"
@@ -14471,15 +14502,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr ""
@@ -14487,15 +14518,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -14503,5 +14534,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr ""
@@ -14510,10 +14541,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr ""
@@ -14524,14 +14555,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr ""
@@ -14545,35 +14576,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr ""
@@ -14581,20 +14612,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr ""
@@ -14602,10 +14633,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr ""
@@ -14613,5 +14644,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr ""
@@ -14619,5 +14650,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr "Pot trajekta"
@@ -14625,5 +14656,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr ""
@@ -14632,5 +14663,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr "Ladjedelnica"
@@ -14638,10 +14669,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr "Uredi ladjedelnico"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr "Dók"
@@ -14649,5 +14680,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr "Uredi dók"
@@ -14655,5 +14686,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr "Jez"
@@ -14661,15 +14692,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr "Uredi jez"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr "Vodna točka"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr "Vodna zapornica"
@@ -14678,5 +14709,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr ""
@@ -14684,20 +14715,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr "Slap"
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr "Uredi slap"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr "Obračališče"
@@ -14706,15 +14737,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr "Pomol"
@@ -14722,10 +14753,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr "Uredi pomol"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr ""
@@ -14733,10 +14764,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr ""
@@ -14746,5 +14777,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr ""
@@ -14752,10 +14783,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr "Železnica"
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr "Železniški tir"
@@ -14763,5 +14794,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr "Uredi železniški tir"
@@ -14791,8 +14822,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr "Vrsta (neobvezno)"
@@ -14806,35 +14837,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr "Tir ozkotirne železnice"
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr "Uredi tir ozkotirne železnice"
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr ""
@@ -14842,45 +14873,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr ""
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr ""
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr "Podzemna"
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr "Uredi podzemno"
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr ""
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr ""
@@ -14888,5 +14919,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -14895,14 +14926,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr "Nerabljen tir"
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr "Uredi nerabljen tir"
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr "Zapuščeni tir"
@@ -14911,5 +14942,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr ""
@@ -14918,5 +14949,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr ""
@@ -14926,5 +14957,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr ""
@@ -14932,5 +14963,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr "Okretnica"
@@ -14939,10 +14970,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr "Žičnica"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr "Sedežnica"
@@ -14950,10 +14981,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr "Uredi sedežnico"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr "Vlečnica"
@@ -14961,10 +14992,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr "Uredi vlečnico"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr "Kabinska žičnica"
@@ -14972,10 +15003,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr "Uredi kabinsko žičnico"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr ""
@@ -14983,5 +15014,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr ""
@@ -14989,5 +15020,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr "Postaja"
@@ -14998,10 +15029,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr "Uredi postajo"
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr "Gorivo"
@@ -15011,5 +15042,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr "Uredi gorivo"
@@ -15025,5 +15056,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15033,5 +15064,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr "Uredi parkirišče"
@@ -15039,41 +15070,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr ""
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr ""
@@ -15081,5 +15112,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr ""
@@ -15087,15 +15118,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr ""
@@ -15103,5 +15134,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr "Izposojevalnica"
@@ -15110,10 +15141,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr "Uredi izposojevalnico avtomobilov"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr ""
@@ -15121,5 +15152,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr ""
@@ -15127,5 +15158,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr ""
@@ -15134,5 +15165,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr "Uredi izposojevalnico koles"
@@ -15141,15 +15172,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "Javni prevoz"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr ""
@@ -15157,5 +15188,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr "Železniško postajališče"
@@ -15163,5 +15194,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr ""
@@ -15169,5 +15200,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr ""
@@ -15176,5 +15207,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr ""
@@ -15182,5 +15213,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr "Železniški peron"
@@ -15189,5 +15220,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr "Uredi železniški peron"
@@ -15199,5 +15230,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr ""
@@ -15205,10 +15236,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr "Vhod v podzemno"
@@ -15217,10 +15248,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr "Uredi vhod v podzemno"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr ""
@@ -15229,5 +15260,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr "Avtobusna postaja"
@@ -15236,5 +15267,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr "Uredi avtobusno postajo"
@@ -15242,5 +15273,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr "Avtobusno postajališče"
@@ -15250,5 +15281,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr "Uredu avtobusno postajališče"
@@ -15259,6 +15290,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr ""
@@ -15266,10 +15297,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr "Avtobusni peron"
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr "Uredi avtobusni peron"
@@ -15277,5 +15308,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr "Taksi"
@@ -15283,5 +15314,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr "Uredi postajališče taksijev"
@@ -15289,5 +15320,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr "Letališče"
@@ -15295,15 +15326,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr ""
@@ -15312,5 +15343,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr "Nastanitev"
@@ -15322,5 +15353,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -15329,15 +15360,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr ""
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr ""
@@ -15345,20 +15376,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr ""
@@ -15366,10 +15397,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr ""
@@ -15377,30 +15408,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr ""
@@ -15408,10 +15439,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "Hrana in pijača"
@@ -15422,5 +15453,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr ""
@@ -15428,5 +15459,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr ""
@@ -15434,5 +15465,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr ""
@@ -15440,61 +15471,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr ""
@@ -15502,9 +15533,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr ""
@@ -15512,10 +15543,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr ""
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr "Pivnica"
@@ -15523,20 +15554,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr "Uredi pivnico"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr ""
@@ -15544,10 +15575,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr ""
@@ -15555,20 +15586,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr ""
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "Turizem"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr ""
@@ -15577,11 +15608,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "Muzej"
@@ -15589,10 +15620,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr "Uredi muzej"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "Živalski vrt"
@@ -15601,10 +15632,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr "Uredi živalski vrt"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr "Razgledišče"
@@ -15612,25 +15643,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr "Uredi razgledišče"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr "Umetnina"
@@ -15638,5 +15669,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr "Uredi umetnino"
@@ -15644,5 +15675,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr ""
@@ -15650,80 +15681,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr ""
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "Zemljevid"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr ""
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr ""
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr ""
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr ""
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
+msgid "Closer Description"
+msgstr ""
+
+#. item "Tourism/Map" text "Closer Description"
+#: build/trans_presets.java:1701
+msgid "Information Board"
+msgstr ""
+
+#. item "Tourism/Information Board" text "Name"
+#: build/trans_presets.java:1705
+msgid "Board Type"
+msgstr ""
+
+#. item "Tourism/Information Board" combo "Board Type"
+#: build/trans_presets.java:1705
+msgid "board"
+msgstr ""
+
+#: build/trans_presets.java:1705
+msgid "history"
+msgstr ""
+
+#: build/trans_presets.java:1705
+msgid "nature"
+msgstr ""
+
+#: build/trans_presets.java:1705
+msgid "wildlife"
+msgstr ""
+
+#. item "Tourism/Information Board" text "Closer Description"
 #: build/trans_presets.java:1708
-msgid "Closer Description"
-msgstr ""
-
-#. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
-msgid "Information Board"
-msgstr ""
-
-#. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
-msgid "Board Type"
-msgstr ""
-
-#. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
-msgid "board"
-msgstr ""
-
-#: build/trans_presets.java:1694
-msgid "history"
-msgstr ""
-
-#: build/trans_presets.java:1694
-msgid "nature"
-msgstr ""
-
-#: build/trans_presets.java:1694
-msgid "wildlife"
-msgstr ""
-
-#. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
 msgid "Guidepost (Hiking)"
 msgstr ""
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr ""
@@ -15731,25 +15762,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "Zgodovinski kraji"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "Grad"
@@ -15758,20 +15789,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr "Uredi grad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "Ruševine"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr "Uredi ruševine"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr "Arheološko najdišče"
@@ -15780,10 +15811,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr "Uredi arheološko najdišče"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr ""
@@ -15791,5 +15822,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr ""
@@ -15797,15 +15828,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr ""
@@ -15813,45 +15844,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "Prosti čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr "Vodni park"
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr "Uredi vodni park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "Igrišče"
@@ -15859,15 +15890,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr "Uredi igrišče"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "Ribarjenje"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr "Uredi ribarjenje"
@@ -15875,15 +15906,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr "Uredi stadion"
@@ -15897,6 +15928,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "izberite šport:"
@@ -15919,4 +15950,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -15977,5 +16016,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -15985,5 +16032,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16129,5 +16176,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16233,5 +16280,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16272,29 +16319,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr "šport"
@@ -16304,227 +16352,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr "lokostrelstvo"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr "košarka"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr "plezanje"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr "kolesarjenje"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr "gimnastika"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr "strelišče"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr "smučanje"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "nogomet"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr "plavanje"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "namizni_tenis"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr "Športno središče"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr "Uredi športno središče"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr "Golf igrišče"
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr "Uredi golf igrišče"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr "Uredi mini golf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr "Šport"
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr ""
@@ -16563,191 +16611,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr "Lokostrelstvo"
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr "Uredi lokostrelstvo"
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr "Plezanje"
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr "Uredi plezanje"
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr ""
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr "Kolesarjenje"
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr "Uredi kolesarjenje"
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr "Pasje dirke"
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr "Uredi pasje dirke"
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr "Konjske dirke"
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr "Uredi konjske dirke"
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr "Gimnastika"
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr "Uredi gimnastiko"
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr "Plavanje"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr "Uredi plavanje"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr "Smučanje"
@@ -16755,56 +16803,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr "Uredi smučanje"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr "Strelišče"
@@ -16812,178 +16860,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr "Uredi strelišče"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr "Šport (z žogo)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr "Nogomet"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr "Uredi nogomet"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr "Košarka"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr "Uredi košarko"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr "Uredi golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr "golf_igrišče"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr "Uredi hokej"
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr "Namizni tenis"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr "Uredi namizni tenis"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr "Uredi tenis"
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "Zgradbe"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr "Zgradba"
@@ -16991,5 +17039,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "Javne zgradbe"
@@ -16997,10 +17045,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr "Uredi javno zgradbo"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "Mestna hiša"
@@ -17008,10 +17056,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "Uredi mestno hišo"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "Veleposlaništvo"
@@ -17019,10 +17067,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "Uredi veleposlaništvo"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "Sodišče"
@@ -17031,10 +17079,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "Uredi sodišče"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "Zapor"
@@ -17043,10 +17091,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "Uredi zapor"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "Policijska postaja"
@@ -17056,10 +17104,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "Uredi policijsko postajo"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "Gasilski dom"
@@ -17068,10 +17116,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "Uredi gasilski dom"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "Pošta"
@@ -17079,5 +17127,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr "Uredi pošto"
@@ -17085,15 +17133,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "Šola"
@@ -17101,10 +17149,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "Uredi šolo"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr ""
@@ -17112,10 +17160,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr ""
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr ""
@@ -17123,5 +17171,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr ""
@@ -17129,5 +17177,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "Kinematograf"
@@ -17136,10 +17184,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "Uredi kinematograf"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "Knjižnica"
@@ -17148,10 +17196,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "Uredi knjižnico"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr ""
@@ -17159,10 +17207,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "Gledališče"
@@ -17171,10 +17219,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "Uredi gledališče"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr "Kraj čaščenja"
@@ -17184,5 +17232,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr "Uredi kraj čaščenja"
@@ -17191,6 +17239,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr "Vera"
@@ -17199,66 +17247,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr ""
@@ -17267,81 +17315,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr "Naslovi"
@@ -17350,5 +17398,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr "Urejanje podatkov o naslovu"
@@ -17356,5 +17404,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr ""
@@ -17362,20 +17410,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr ""
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr ""
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "Poštna številka"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr ""
@@ -17383,5 +17431,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr "Interpolacija naslovov"
@@ -17390,5 +17438,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr "Uredi interpolacijo naslovov"
@@ -17396,71 +17444,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr ""
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "Stolp"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "Uredi stolp"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "Vodni stolp"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "Uredi vodni stolp"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "Svetilnik"
@@ -17468,10 +17516,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "Uredi svetilnik"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "Mlin na veter"
@@ -17479,10 +17527,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "Uredi mlin na veter"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "Cevovod"
@@ -17490,10 +17538,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "Uredi cevovod"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr "Čistilna naprava"
@@ -17503,10 +17551,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr "Uredi čistilno napravo"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr "Žerjav"
@@ -17514,10 +17562,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr "Uredi žerjav"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr ""
@@ -17525,10 +17573,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr "Geodetska točka"
@@ -17536,10 +17584,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr "Uredi geodetsko točko"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr "Video nadzor"
@@ -17547,5 +17595,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr "Uredi video nadzorno kamero"
@@ -17553,5 +17601,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr ""
@@ -17561,39 +17609,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr ""
@@ -17602,10 +17650,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr ""
@@ -17614,5 +17662,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -17620,10 +17668,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr "Steber daljnovoda"
@@ -17634,5 +17682,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr "Uredi steber daljnovoda"
@@ -17640,5 +17688,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr ""
@@ -17647,25 +17695,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "Stranišča"
@@ -17673,20 +17721,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr "Poštni nabiralnik"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "Telefon"
@@ -17695,5 +17743,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr "Uredi telefon"
@@ -17701,5 +17749,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "Kovanci"
@@ -17707,5 +17755,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr "Bankovci"
@@ -17713,5 +17761,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -17719,5 +17767,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr "Debetne kartice"
@@ -17725,15 +17773,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "Kreditne kartice"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "Telefonske kartice"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr "Recikliranje"
@@ -17742,5 +17790,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr "Uredi raciklažno točko"
@@ -17748,35 +17796,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr "Klopca"
@@ -17785,20 +17833,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr ""
@@ -17806,22 +17854,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr ""
@@ -17830,10 +17878,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "Pitna voda"
@@ -17842,10 +17890,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "Uredi pitno vodo"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr ""
@@ -17853,25 +17901,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "Trgovine"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr ""
@@ -17879,10 +17927,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr ""
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr ""
@@ -17890,10 +17938,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr ""
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "Prodajni avtomat"
@@ -17901,5 +17949,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "Uredi prodajni avtomat"
@@ -17907,88 +17955,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "Prodajani izdelki"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "pijača"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "SIM kartice"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "Mesar"
@@ -17996,10 +18044,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "Uredi mesarja"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "Pekarna"
@@ -18007,10 +18055,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "Uredi pekarno"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr ""
@@ -18018,20 +18066,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr ""
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr ""
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr ""
@@ -18039,60 +18087,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr ""
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr ""
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr ""
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr ""
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr ""
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr ""
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr ""
@@ -18100,10 +18148,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr ""
@@ -18111,10 +18159,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr "Sam svoj mojster"
@@ -18122,60 +18170,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr "Uredi sam svoj mojster trgovino"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr ""
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr ""
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr ""
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr ""
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "Čistilnica"
@@ -18183,10 +18231,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "Uredi čistilnico"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "Pralnica"
@@ -18194,10 +18242,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "Uredi pralnico"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr ""
@@ -18205,35 +18253,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr ""
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr ""
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "Denar"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "Banka"
@@ -18241,5 +18289,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "Uredi banko"
@@ -18247,10 +18295,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr "Menjalnica"
@@ -18258,5 +18306,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr "Uredi menjalnico"
@@ -18264,15 +18312,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "Uredi bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "Zdravje"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr ""
@@ -18280,20 +18328,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr ""
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr ""
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "Lekarna"
@@ -18301,5 +18349,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "Uredi lekarno"
@@ -18307,10 +18355,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "Bolnišnica"
@@ -18318,10 +18366,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "Uredi bolnišnico"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr ""
@@ -18330,5 +18378,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -18337,20 +18385,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -18358,5 +18406,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr ""
@@ -18365,56 +18413,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr ""
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr "Uredi kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr "Država"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr "Uredi državo"
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr ""
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr ""
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr ""
@@ -18422,15 +18469,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr ""
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr ""
@@ -18438,10 +18485,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr ""
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr ""
@@ -18449,25 +18496,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr ""
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "Vas"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "Uredi vas"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr "Zaselek"
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr "Uredi zaselek"
@@ -18475,5 +18522,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr ""
@@ -18481,10 +18528,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "Otok"
@@ -18492,5 +18539,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "Uredi otok"
@@ -18498,5 +18545,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr ""
@@ -18504,10 +18551,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr ""
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "Vrh"
@@ -18515,10 +18562,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "Uredi vrh"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr ""
@@ -18526,10 +18573,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr ""
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr ""
@@ -18537,70 +18584,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr ""
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr "Meje"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr ""
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr "Raba tal"
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "Drevo"
@@ -18609,15 +18656,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "Uredi drevo"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr ""
@@ -18626,5 +18673,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr ""
@@ -18632,17 +18679,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "Gozd"
@@ -18651,14 +18698,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr "Uredi gozdnata tla"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr "Naravni rezervat"
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr "Uredi naravni rezervat"
@@ -18666,25 +18713,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr ""
@@ -18692,10 +18739,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr ""
@@ -18703,5 +18750,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr ""
@@ -18709,5 +18756,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr ""
@@ -18716,45 +18763,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr "Vinograd"
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr "Uredi vinograd"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -18762,25 +18809,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr ""
@@ -18788,10 +18835,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr ""
@@ -18799,20 +18846,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr ""
@@ -18820,5 +18867,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -18826,15 +18873,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr "Pokopališče"
@@ -18842,9 +18889,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr "Uredi pokopališče"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr ""
@@ -18852,39 +18899,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr "Ozemlje železnice"
@@ -18892,15 +18939,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr "Uredi ozemlje železnice"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr ""
@@ -18908,55 +18955,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr "Gradbišče"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr "Kamnolom"
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr "Uredi kamnolom"
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr ""
@@ -18966,5 +19013,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr ""
@@ -18973,10 +19020,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr ""
@@ -18984,5 +19031,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr ""
@@ -18991,5 +19038,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -18997,34 +19044,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr ""
@@ -19033,15 +19080,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr ""
@@ -19049,5 +19096,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr ""
@@ -19056,5 +19103,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr ""
@@ -19062,5 +19109,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr ""
@@ -19132,24 +19179,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr ""
@@ -19202,20 +19249,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr ""
@@ -19229,10 +19276,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr ""
@@ -19240,26 +19287,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr ""
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "Zasuk"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr ""
@@ -19268,30 +19321,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr ""
@@ -19327,6 +19380,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19342,5 +19396,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19359,5 +19421,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr ""
@@ -19451,7 +19513,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr ""
@@ -19716,15 +19778,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr ""
@@ -19766,5 +19828,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr ""
@@ -19902,4 +19964,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19911,5 +19979,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19917,5 +19985,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19952,5 +20020,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19974,11 +20042,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr ""
@@ -20002,5 +20070,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20041,5 +20109,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20077,6 +20145,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr ""
@@ -20132,7 +20200,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr ""
@@ -20185,11 +20253,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr ""
@@ -20210,5 +20286,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr ""
@@ -20222,5 +20298,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr ""
@@ -20241,5 +20317,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr ""
@@ -20253,6 +20329,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr ""
@@ -20267,5 +20343,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr ""
@@ -20279,5 +20355,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr ""
@@ -20291,5 +20367,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr ""
@@ -20317,5 +20393,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr ""
@@ -20458,5 +20534,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20483,13 +20559,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr ""
@@ -20551,7 +20627,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr ""
@@ -20574,10 +20650,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr ""
@@ -20613,7 +20689,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr ""
@@ -20658,6 +20734,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr ""
@@ -20671,5 +20747,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr ""
@@ -20691,5 +20767,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr ""
@@ -20703,5 +20779,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr ""
@@ -20709,4 +20785,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20749,7 +20832,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr ""
@@ -20766,5 +20849,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr ""
@@ -20779,5 +20862,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr ""
@@ -20792,5 +20875,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr ""
@@ -20805,5 +20888,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr ""
@@ -20818,5 +20901,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr ""
@@ -20831,5 +20914,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr ""
@@ -20852,4 +20935,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -20860,4 +20950,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -20934,10 +21032,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr ""
@@ -20951,5 +21050,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr ""
@@ -20963,5 +21062,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr ""
@@ -21089,12 +21188,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr ""
@@ -21108,5 +21207,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr ""
@@ -21178,8 +21277,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr ""
@@ -21281,10 +21380,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr ""
@@ -21304,4 +21403,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21323,4 +21429,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21644,4 +21757,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -21668,24 +21789,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr ""
@@ -21717,6 +21846,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr ""
@@ -21777,8 +21906,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr ""
@@ -22131,26 +22260,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr ""
@@ -22205,5 +22334,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22222,8 +22351,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr ""
@@ -22373,9 +22502,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr ""
@@ -22447,8 +22576,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr ""
@@ -22519,8 +22648,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr ""
@@ -22534,5 +22663,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr ""
@@ -22546,5 +22675,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr ""
@@ -22566,5 +22695,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr ""
@@ -22578,5 +22707,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr ""
@@ -22590,5 +22719,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr ""
@@ -22611,5 +22740,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr ""
@@ -22623,5 +22752,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr ""
@@ -22635,5 +22764,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr ""
@@ -22647,5 +22776,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr ""
@@ -22659,5 +22788,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr ""
@@ -22714,7 +22843,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr ""
@@ -22728,5 +22857,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr ""
@@ -22739,5 +22868,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr ""
@@ -22752,5 +22881,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr ""
@@ -22764,5 +22893,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr ""
@@ -22817,8 +22946,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr ""
@@ -22832,5 +22961,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr ""
@@ -22844,5 +22973,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr ""
@@ -22856,5 +22985,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr ""
@@ -22868,5 +22997,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr ""
@@ -22880,5 +23009,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr ""
@@ -22956,8 +23085,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr ""
@@ -23005,7 +23134,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr ""
@@ -23147,10 +23276,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr ""
@@ -23198,6 +23327,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr ""
@@ -23494,7 +23623,4 @@
 msgstr ""
 
-#~ msgid "Unknown file extension."
-#~ msgstr "Neznana končnica datoteke."
-
 #~ msgid "Move"
 #~ msgstr "Premakni"
@@ -23558,4 +23684,7 @@
 #~ msgstr "Razreši {0} sporov v {1} predmetih"
 
+#~ msgid "Unknown file extension."
+#~ msgstr "Neznana končnica datoteke."
+
 #~ msgid "Adjust the position of the WMS layer"
 #~ msgstr "Prilagodi položaj plasti WMS"
@@ -23590,7 +23719,4 @@
 #~ msgid "image not loaded"
 #~ msgstr "slika ni naložena"
-
-#~ msgid "Rotate"
-#~ msgstr "Zasuk"
 
 #~ msgid ""
Index: /applications/editors/josm/i18n/po/sv.po
===================================================================
--- /applications/editors/josm/i18n/po/sv.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/sv.po	(revision 17069)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
 "PO-Revision-Date: 2009-08-04 10:57+0000\n"
 "Last-Translator: Konrad Skeri <konrad@skeri.com>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-10 11:58+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -56,6 +56,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -100,6 +100,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "Fel"
@@ -111,5 +111,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "Osparade ändringar"
@@ -129,10 +129,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -149,15 +149,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -187,6 +187,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -216,5 +216,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -374,5 +374,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
 msgstr ""
@@ -456,9 +456,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -491,7 +491,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -579,37 +579,37 @@
 "{0} noder i väg {1} överskrider det maximala antalet tillåtna noder {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "lager"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "urval"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "nedhämtad data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zooma till {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zooma det visade till  {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -619,30 +619,30 @@
 msgstr "Visa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "Det finns inte något valt att zooma till"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "Det finns inte några konflikter att zooma till"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "Slå ihop sträckor"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "Förena flera sträckor till en enda."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "Välj åtminstone två sträckor att slå ihop"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr "Slå ihop sträckor med olika roller?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -651,13 +651,13 @@
 "De valda sträckorna har olika roller i relationen. Vill du ändå slå ihop dem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "Slå ihop i alla fall"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "Ändra riktning?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -667,10 +667,10 @@
 "några av dem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "Byt riktning och slå ihop"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -678,20 +678,20 @@
 msgstr "Ange värden för alla konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Jämka konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Slå ihop {0} sträckor"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "Alla sträckor var tomma"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -740,6 +740,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -761,6 +761,6 @@
 msgstr "Ta bort valda objekt."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -770,5 +770,5 @@
 msgstr "Skriv över"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -900,7 +900,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "Exportera data till en GPX-fil"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -916,5 +915,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -932,5 +931,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -1004,22 +1003,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "Slå ihop noder"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "Slå ihop noder med den äldsta."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "Välj åtminstone två noder att slå ihop."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr "Slå ihop noder med olika medlemskap?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1028,9 +1027,9 @@
 "De valda noderna har olika relationsmedlemsskap. Vill du ändå slå ihop dem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "Slå ihop i alla fall"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -1038,5 +1037,5 @@
 "behöva tas bort."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1292,7 +1291,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "Inga tvärsnitt hittades. Ingenting har ändrats."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1899,5 +1897,5 @@
 msgstr "Fel under nedladdning"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1914,5 +1912,5 @@
 "<br>Klicka på <strong>{2}</strong> för att ignorera.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr "Raderade eller flyttade primitiv"
@@ -1951,11 +1949,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2095,5 +2093,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2173,5 +2171,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Sök efter objekt."
@@ -2303,5 +2301,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Sök"
@@ -2503,5 +2501,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2546,5 +2544,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr "Ta bort från relation"
@@ -2586,9 +2584,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "Slå ihop {0} noder"
-msgstr[1] "Slå ihop {0} noder"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2624,9 +2622,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "Rotera {0} {1}"
-msgstr[1] "Rotera {0} {1}"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2790,7 +2788,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "Ändra {0} {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2800,5 +2798,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2845,5 +2843,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2876,5 +2874,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2888,5 +2886,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "järnväg"
@@ -2901,5 +2899,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3183,5 +3181,5 @@
 msgstr "Visa inte igen"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3193,5 +3191,5 @@
 "inställningar."
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3204,10 +3202,10 @@
 "är: <br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr "Brott mot förhandsvillkor"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3215,25 +3213,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "okänd"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3243,9 +3241,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3254,9 +3252,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "Oväntat undantag"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3266,9 +3276,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "Okänd värddator"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3281,5 +3291,5 @@
 "är:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr "Primitiv redan raderad"
@@ -3369,10 +3379,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "Användarnamn"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "Lösenord"
@@ -3576,15 +3586,15 @@
 msgstr "(inget objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "lagret finns inte i listan."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3638,5 +3648,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr ""
@@ -3645,5 +3655,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr ""
@@ -3652,20 +3662,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3675,6 +3685,6 @@
 msgstr "Taggar"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3682,6 +3692,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3689,40 +3699,40 @@
 msgstr "Medlemmar"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3730,74 +3740,74 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3805,30 +3815,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3836,5 +3846,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3842,13 +3852,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3856,5 +3866,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3862,21 +3872,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3885,27 +3895,27 @@
 msgstr "Ta bort"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3913,5 +3923,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3920,5 +3930,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3927,5 +3937,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3934,5 +3944,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -3941,21 +3951,21 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -3965,5 +3975,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -3973,5 +3983,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -3979,19 +3989,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -4000,19 +4010,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr "Ja, återskapa dem också"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr "Nej, avbryt"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -4023,9 +4033,9 @@
 "raderade på servern.<br><br>Vill du återskapa dessa noder också?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr "Återskapa ytterligare noder?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -4035,13 +4045,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -4049,90 +4059,90 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "raderad"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4142,17 +4152,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4161,14 +4171,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4176,21 +4186,21 @@
 msgstr "Roll"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4198,14 +4208,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4213,7 +4223,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4225,7 +4235,7 @@
 msgstr "Nyckel"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4238,45 +4248,45 @@
 msgstr "Värde"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr ""
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4296,8 +4306,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4335,5 +4345,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4435,83 +4445,83 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "Lager"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "Öppna en lista av alla inlästa lager."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "Ta bort valt lager."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr "Ta bort lager"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "Visa/Dölj"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "Alternera visning av det valda lagret."
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "Flytta det valda lagret en rad upp."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "Flytta det valda lagret en rad ner."
@@ -4521,6 +4531,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4529,22 +4539,22 @@
 msgstr[1] "Detta kommer att ändra upp till {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "Om värdet är tomt tas nyckeln bort."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<olika>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "Ändra värden?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4552,5 +4562,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4559,40 +4569,40 @@
 msgstr[1] "Ändra egenskaper för upp till {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "Välj en nyckel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "Välj ett värde"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 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/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "Egenskaper/Roller"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "Egenskaper för valda objekt."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "Medlem av"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "Lägg till egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4609,39 +4619,39 @@
 msgstr "Lägg till"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 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/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "Redigera egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 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/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaper: {0} / Medlemskap: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "Egenskaper / Roller"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "Ändra relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, 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/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 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/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "Ta bort egenskaper"
@@ -4653,5 +4663,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "Relationer"
@@ -4683,31 +4693,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "Aktuellt urval"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "Öppna en urvalslista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "Zooma till valda objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "Uppdatera urvalslistan."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "Zooma till urval"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Urval: Rel.:{0}/Sträckor:{1}/Noder:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4715,5 +4725,5 @@
 msgstr "Markering"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4722,5 +4732,5 @@
 msgstr[1] "{0} sträckor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4729,5 +4739,5 @@
 msgstr[1] "{0} relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -4939,7 +4949,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "Ta bort den valda relationen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -5022,5 +5031,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5262,5 +5271,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "Platser"
@@ -5307,21 +5316,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "typ"
@@ -6121,72 +6130,515 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "Namn"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr "Bilder för {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr "Läs in GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Tid saknas för punkt {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, 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}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr "Inga bilder med läsbara tidsangivelser hittades."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "Läser {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr "Geotaggade bilder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS startpunkt: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS slutpunkt: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr "nuvarande delta: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr "tidsskillnad: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "bild"
+msgstr[1] "bilder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} inom spåret."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "Synka klocka"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG-bilder (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "Datum i fil \"{0}\" kunde inte tolkas."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Det finns inte någon EXIF-tid i filen\"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "Bild"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Ange visat datum (mm/dd/yyyy HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr "Tidszon för GPS-enhet (skillnad mot foto)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr "Synkronisera Tid med GPS-enheten"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr "Angiven tid kunde inte tolkas."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr "gps-punkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "Anpassa linjeritning"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr "Använd globala inställningar"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr "Rita linjer mellan punkter i detta lager."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr "Rita inte linjer mellan punkter i detta lager."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr "Välj alternativ för linjeritning"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "Anpassa färger"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Standard"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Välj en färg"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr "Markörer från namngivna punkter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Namngivna spårpunkter från {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "Importera ljud"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave-ljudfiler (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Ljudmarkörer från {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "Importera bilder"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} spår, "
+msgstr[1] "{0} spår, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} rutt, "
+msgstr[1] "{0} rutter, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} sträckpunkt"
+msgstr[1] "{0} sträckpunkter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr "Namn: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr "Beskrivning: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr "Tidsomfång: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr "Längd: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "Omvandla till datalager"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>Det anses skadligt att skicka in obehandlad GPS-data.<br>Om du vill "
+"skicka in spår, se här:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Omvandlad från:{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr "Hämta från OSM längs med detta spår"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr "Hämta allting inom:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr "{0} meter"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr "Största tillåtna område per begäran:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km2"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>För att utföra detta så kommer {0} separata<br>hämtningar att begäras. "
+"Önskar du<br>fortsätta?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr "Det finns inte något GPX-spår i lagret att knyta ljudet till."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"Några sträckpunkter med tidsstämplar tidigare än spårets början eller senare "
+"än dess slut uteslöts eller flyttades till början."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Några sträckpunkter som låg för långt från spåret för att deras tid skulle "
+"kunna uppskattas med någon rimlighet uteslöts."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Datalager {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr "utanför hämtat område"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} består av:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} raderad.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr "Omvandla till gpx-lager"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6195,7 +6647,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6205,448 +6657,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "Namn"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr "Bilder för {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr "Läs in GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Tid saknas för punkt {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, 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}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr "Inga bilder med läsbara tidsangivelser hittades."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Läser {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr "Geotaggade bilder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS startpunkt: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS slutpunkt: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr "nuvarande delta: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr "tidsskillnad: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "bild"
-msgstr[1] "bilder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} inom spåret."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "Synka klocka"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG-bilder (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "Datum i fil \"{0}\" kunde inte tolkas."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Det finns inte någon EXIF-tid i filen\"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "Bild"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Ange visat datum (mm/dd/yyyy HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr "Tidszon för GPS-enhet (skillnad mot foto)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr "Synkronisera Tid med GPS-enheten"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr "Angiven tid kunde inte tolkas."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr "gps-punkt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "Anpassa linjeritning"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "Använd globala inställningar"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr "Rita linjer mellan punkter i detta lager."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr "Rita inte linjer mellan punkter i detta lager."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr "Välj alternativ för linjeritning"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "Anpassa färger"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Standard"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Välj en färg"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr "Markörer från namngivna punkter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "Namngivna spårpunkter från {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "Importera ljud"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave-ljudfiler (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Ljudmarkörer från {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "Importera bilder"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} spår, "
-msgstr[1] "{0} spår, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} rutt, "
-msgstr[1] "{0} rutter, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} sträckpunkt"
-msgstr[1] "{0} sträckpunkter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr "Namn: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr "Beskrivning: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr "Tidsomfång: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr "Längd: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "Omvandla till datalager"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>Det anses skadligt att skicka in obehandlad GPS-data.<br>Om du vill "
-"skicka in spår, se här:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Omvandlad från:{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr "Hämta från OSM längs med detta spår"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr "Hämta allting inom:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr "{0} meter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr "Största tillåtna område per begäran:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km2"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>För att utföra detta så kommer {0} separata<br>hämtningar att begäras. "
-"Önskar du<br>fortsätta?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr "Det finns inte något GPX-spår i lagret att knyta ljudet till."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-"Några sträckpunkter med tidsstämplar tidigare än spårets början eller senare "
-"än dess slut uteslöts eller flyttades till början."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Några sträckpunkter som låg för långt från spåret för att deras tid skulle "
-"kunna uppskattas med någon rimlighet uteslöts."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Datalager {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr "utanför hämtat område"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} består av:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} raderad.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr "Omvandla till gpx-lager"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -7034,5 +7043,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "Bil"
@@ -7049,16 +7058,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "Cykel"
@@ -7086,14 +7097,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "Fotgängare"
@@ -7313,19 +7327,19 @@
 msgstr "Språk"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr "Aktivera inbyggda förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr ""
@@ -7456,36 +7470,11 @@
 msgstr "Lösenord för proxyserver"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Bas-URL för OSM-servern (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Lösenord för OSM-kontot. Lämna blankt för att inte spara något lösenord."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "Bas-URL för servern"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "OSM-lösenord"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -7862,7 +7851,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "Kunde inte öppna \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -7967,7 +7956,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "Okänd roll ''{0}''."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8125,23 +8114,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "Felaktigt lösenord eller användarnamn."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Varning: Lösenordet skickas okrypterat."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "Spara användare och lösenord (okrypterat)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "Ange lösenord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
 msgstr "Logga in"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr ""
+"Lösenord för OSM-kontot. Lämna blankt för att inte spara något lösenord."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "OSM-lösenord"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -8151,7 +8165,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-msgstr "förväntade instans av OsmDataLayer eller GpxLayer. Erhöll \"{0}\"."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -8304,14 +8318,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "Okänd medlemstyp för ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "Förbereder OSM-data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr "Felformaterad nod-id"
@@ -8774,5 +8788,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr "Beskrivning"
@@ -9189,5 +9203,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr "Fel vid läsning av fil"
@@ -9520,5 +9534,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -10059,7 +10073,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr "vatten"
@@ -10243,7 +10257,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "namn"
+msgstr ""
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10806,12 +10819,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "början"
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0} nod"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -10952,5 +10965,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr "Gatunamn"
@@ -11791,7 +11804,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr "byggnad (building)"
@@ -11805,5 +11818,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr "yta (area)"
@@ -12044,17 +12057,14 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "Välj vilken rad du vill ändra."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "Ta bort lager"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Start adjusting"
-msgstr "Påbörja ruttberäkning"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
@@ -12063,7 +12073,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "Det finns inte några ändringar att skicka in."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -12074,61 +12083,61 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr "Automatisk hämtning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS-lager ({0}), hämtas automatiskt i zoomläge {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS-lager ({0}), hämtas i zoomläge {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr "Den begärda ytan är för stor. Zooma in lite eller ändra upplösning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr "Hämta de rutor som syns"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr "Ändra upplösning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr "Läs om felaktiga rutor"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr "Alfakanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr "Spara WMS-lagret till en fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr "Hämta WMS-lager från en fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "WMS-filversion som ej stöds; funnen {0}, förväntad {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr "Fel filformat"
@@ -12461,4 +12470,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12495,5 +12506,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr "Vägar"
@@ -12504,5 +12515,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Motorväg"
@@ -12511,5 +12522,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr "Redigera en motorväg"
@@ -12536,8 +12547,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr "Referens"
@@ -12578,21 +12589,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr "Lager"
@@ -12606,8 +12617,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr "Filer"
@@ -12625,15 +12636,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr "Största tillåtna hastighet (km/h)"
@@ -12670,16 +12681,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr "Enkelriktat"
@@ -12721,19 +12732,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Bro"
@@ -12769,19 +12780,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -12815,18 +12826,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr "Skärning"
@@ -12860,18 +12871,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr "Bank"
@@ -12879,5 +12890,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr "Motorvägslänk"
@@ -12886,5 +12897,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr "Redigera en motorvägslänk"
@@ -12892,5 +12903,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr "Stamväg"
@@ -12899,5 +12910,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr "Redigera en stamväg"
@@ -12907,6 +12918,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr ""
@@ -12914,5 +12925,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr "Stamvägslänk"
@@ -12921,5 +12932,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr "Redigera en stamvägslänk"
@@ -12932,5 +12943,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Primär"
@@ -12939,5 +12950,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr "Redigera en primär väg"
@@ -12945,10 +12956,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr "Primärvägslänk"
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr "Redigera en primärvägslänk"
@@ -12960,5 +12971,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Sekundär"
@@ -12968,5 +12979,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr "Redigera en sekundär väg"
@@ -12974,5 +12985,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr "Tertiär"
@@ -12982,5 +12993,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr "Redigera en tertiär väg"
@@ -12992,5 +13003,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Oklassificerad"
@@ -13000,5 +13011,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr "Redigera en oklassificerad väg"
@@ -13025,19 +13036,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr "Bredd (meter)"
@@ -13049,5 +13060,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Bostadsområde"
@@ -13056,5 +13067,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr "Redigera en gata i bostadsområde"
@@ -13078,13 +13089,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr "Yta"
@@ -13104,20 +13115,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr "belagd"
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr "obelagd"
@@ -13125,12 +13136,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr "kullersten"
@@ -13138,5 +13149,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr "Gårdsgata"
@@ -13145,5 +13156,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr "Redigera en gårdsgata"
@@ -13151,5 +13162,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr "Tillfartsväg"
@@ -13158,5 +13169,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr "Redigera en tillfartsväg"
@@ -13166,18 +13177,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr "Type av tillfartsväg"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr "gränd"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr "uppfart"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr ""
@@ -13185,5 +13196,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr ""
@@ -13193,5 +13204,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -13199,5 +13210,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr "Väg (okänd typ)"
@@ -13206,5 +13217,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr "Redigera en väg av okänd typ"
@@ -13213,20 +13224,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr "Vägbegränsningar"
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr "Redigera vägbegränsningar"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr "Betalstation"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr "Återvändsgränd"
@@ -13239,8 +13250,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr ""
@@ -13284,23 +13295,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr "ja"
@@ -13313,40 +13324,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr "privat"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr "avsedd för"
@@ -13359,19 +13370,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr "mål"
@@ -13394,65 +13405,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr "med tillåtelse"
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr "jordbruksfordon"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr "nej"
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr "Lätt lastbil"
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Tung lastbil"
@@ -13467,10 +13478,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr "Häst"
@@ -13486,13 +13497,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr "Motorcykel"
@@ -13508,30 +13519,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr "Bil"
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr "Allmänna transportmedel (psv)"
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr "Motorbåt"
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr "Båt"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr "Minsta tillåtna hastighet (km/h)"
@@ -13539,25 +13550,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr "Största tillåtna vikt (ton)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr "Största tillåtna höjd (meter)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr "Största tillåtna bredd (meter)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr "Största tillåtna längd (meter)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr "Rondell"
@@ -13568,5 +13579,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr "Redigera en korsning"
@@ -13588,9 +13599,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr "Typ"
@@ -13610,10 +13621,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr "motorväg"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr "motorvägslänk"
@@ -13635,10 +13646,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr "stamväg"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr "stamvägslänk"
@@ -13660,10 +13671,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr "primärväg"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr "primärvägslänk"
@@ -13685,6 +13696,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr "sekundärväg"
@@ -13698,9 +13709,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr "tertiärväg"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr "oklassificerad"
@@ -13714,9 +13725,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr "bostadsgata"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr "gårdsgata"
@@ -13746,10 +13757,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr "tillfartsväg"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr "buss_spårväg"
@@ -13757,4 +13768,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13772,6 +13790,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr "under byggnad"
@@ -13782,10 +13800,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr "Redigera en bro"
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr "Redigera en tunnel"
@@ -13793,19 +13811,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr "Stigar och småvägar"
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr "Under byggnad"
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr "Redigera en väg under byggnad"
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr "Korsning"
@@ -13821,5 +13839,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr "rondell"
@@ -13828,5 +13846,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr "Gång-/Ridstig"
@@ -13834,5 +13852,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr "Redigera en gång-/ridstig"
@@ -13840,5 +13858,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr "Cykelbana"
@@ -13848,5 +13866,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr "Redigera en cykelbana"
@@ -13854,5 +13872,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr "Gångstig"
@@ -13861,5 +13879,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr "Redigera en gångstig"
@@ -13867,5 +13885,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr "Gågata"
@@ -13874,5 +13892,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr "Redigera en gågata"
@@ -13880,5 +13898,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr "Trappsteg"
@@ -13888,5 +13906,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr "Redigera en trappa"
@@ -13895,5 +13913,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr "Bruksväg"
@@ -13902,14 +13920,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr "Redigera en bruksväg"
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr "grus"
@@ -13917,18 +13935,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr "gräs"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr "sand"
@@ -13936,5 +13954,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr "Bruksväg klass 1"
@@ -13943,5 +13961,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr "Redigera en bruksväg klass 1"
@@ -13949,5 +13967,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr "Bruksväg klass 2"
@@ -13956,5 +13974,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr "Redigera en bruksväg klass 2"
@@ -13962,5 +13980,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr "Bruksväg klass 3"
@@ -13969,5 +13987,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr "Redigera en bruksväg klass 3"
@@ -13975,5 +13993,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr "Bruksväg klass 4"
@@ -13982,5 +14000,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr "Redigera en bruksväg klass 4"
@@ -13988,5 +14006,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr "Bruksväg klass 5"
@@ -13995,5 +14013,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr "Redigera en bruksväg klass 5"
@@ -14002,5 +14020,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr "Stig"
@@ -14009,13 +14027,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr "Redigera en stig"
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr "Snöskoter"
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr "Skidor"
@@ -14023,5 +14041,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr "Vandringsled"
@@ -14031,5 +14049,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr "Redigera en vandringsled"
@@ -14037,5 +14055,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr "Bergsvandringsled"
@@ -14045,5 +14063,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr "Redigera en bergsvandringsled"
@@ -14051,5 +14069,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr "Krävande bergsvandringsled"
@@ -14059,5 +14077,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Redigera en krävande bergsvandringsled"
@@ -14065,5 +14083,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr "Fjällvandringsled"
@@ -14073,5 +14091,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr "Redigera en fjällvandringsled"
@@ -14079,5 +14097,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr "Krävande fjällvandringsled"
@@ -14087,5 +14105,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Redigera en krävande fjällvandringsled"
@@ -14093,5 +14111,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr "Svår fjällvandringsled"
@@ -14101,5 +14119,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Redigera en svår fjällvandringsled"
@@ -14107,10 +14125,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr "Vägpunkter"
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr "Motorvägskorsning"
@@ -14118,15 +14136,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr "Redigera en motorvägskorsning"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr ""
@@ -14134,5 +14152,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr ""
@@ -14167,14 +14185,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr "Operatör"
@@ -14183,5 +14201,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr "Trafikljus"
@@ -14191,5 +14209,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr "Typ av övergångsställe"
@@ -14198,27 +14216,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr "obevakad"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr "trafikljus"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr "ö"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr "utan markering"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr "Korsa ridande"
@@ -14226,6 +14244,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr "Korsa cyklande"
@@ -14234,11 +14252,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr "Brittiskt namn på övergångsställe"
@@ -14246,30 +14264,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr "övergångsställe"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr "pelican"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr "Stopp"
@@ -14277,5 +14295,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr "Övergångsställe för fotgängare"
@@ -14284,14 +14302,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr "Brittiskt typnamn"
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr "Minirondell"
@@ -14302,14 +14320,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr "Riktning"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr "medurs"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr "Vändplats"
@@ -14319,20 +14337,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr "Stadsgräns"
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr "Redigera en stadsgränsskylt"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr "Andra namn"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr "Hastighetskamera"
@@ -14340,5 +14358,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr "Nödtelefon"
@@ -14346,5 +14364,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr ""
@@ -14352,5 +14370,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr ""
@@ -14359,10 +14377,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr "Vadställe"
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr "Redigera ett vadställe"
@@ -14370,5 +14388,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr "Bergspass"
@@ -14376,5 +14394,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr "Redigera ett bergspass"
@@ -14386,7 +14404,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr "Höjd"
@@ -14394,5 +14412,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr "Hinder"
@@ -14400,5 +14418,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr "Trafikkon"
@@ -14406,5 +14424,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr "Redigera en trafikkon"
@@ -14443,18 +14461,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr "Tillåten trafik:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr ""
@@ -14463,5 +14485,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr ""
@@ -14469,5 +14491,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr "Färist"
@@ -14475,10 +14497,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr "Redigera en färist"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr "Bussfålla"
@@ -14486,15 +14508,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr "Spikhinder"
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr "Redigera spikhinder"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr "Betalstation"
@@ -14502,5 +14524,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr "Redigera betalstation"
@@ -14508,10 +14530,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr "Gränskontroll"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr "Redigera en gränskontroll"
@@ -14521,5 +14543,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr "Häck"
@@ -14528,5 +14550,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr "Stängsel"
@@ -14535,5 +14557,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr "Mur"
@@ -14541,5 +14563,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr "Stadsmur"
@@ -14548,5 +14570,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr "Stödmur"
@@ -14558,15 +14580,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr "Ingång"
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr "Redigera en ingång"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr "Grind"
@@ -14574,50 +14596,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr "Redigera en grind"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr "Bom"
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr "Redigera en bom"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr "Taggtrådsgrind"
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr "Redigera en taggtrådsgrind"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr "Fösgrind"
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr "Redigera en fösgrind"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr "Manshål"
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr "Redigera ett manshål"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr "Stätta"
@@ -14625,15 +14647,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr "Redigera en stätta"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+#, fuzzy
+msgid "Turnstile"
+msgstr "Vändskiva"
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "Redigera en stätta"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr "Utfallsport"
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr "Redigera en utfallsport"
@@ -14644,10 +14678,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr "Vatten"
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr "Källa"
@@ -14655,5 +14689,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr "Redigera en källa"
@@ -14661,5 +14695,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr "Avlopp"
@@ -14667,10 +14701,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr "Redigera en avloppsränna"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr "Bäck"
@@ -14678,10 +14712,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr "Redigera en bäck"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr "Kanal"
@@ -14689,10 +14723,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr "Redigera en kanal"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr "Flod"
@@ -14702,5 +14736,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr "Redigera en flod"
@@ -14708,15 +14742,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr "Redigera vatten"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr "Redigera land"
@@ -14724,15 +14758,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr "Hamnbassäng"
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr "Redigera användning av mark för hamnbassäng"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr "Resevoar"
@@ -14740,15 +14774,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr "Redigera användning av mark för resevoar"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr "Täckt resevoar"
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr "Redigera täckt resevoar"
@@ -14756,5 +14790,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr "Flodbank"
@@ -14763,10 +14797,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr "Redigera en flodbank"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr "Våtmark"
@@ -14777,14 +14811,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr "Redigera våtmark"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr "träsk"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr "mosse"
@@ -14798,35 +14832,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr "kärr"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr "vassbädd"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr "saltäng"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr "marskland"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr "mangroveträsk"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr "Lera"
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr "Redigera lera"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr "Strand"
@@ -14834,20 +14868,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr "Redigera strand"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr "Bukt"
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr "Redigera bukt"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr "Stup"
@@ -14855,10 +14889,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr "Redigera stup"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr "Kustlinje"
@@ -14866,5 +14900,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr "Redigera kustlinje"
@@ -14872,5 +14906,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr "Färjelinje"
@@ -14878,5 +14912,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr "Redigera en färjelinje"
@@ -14885,5 +14919,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr "Varv"
@@ -14891,10 +14925,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr "Redigera ett varv"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr "Docka"
@@ -14902,5 +14936,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr "Redigera en docka"
@@ -14908,5 +14942,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr "Damm"
@@ -14914,15 +14948,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr "Redigera en damm"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr "Vattenpunkter"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr "Slussport"
@@ -14931,5 +14965,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr "Överfallsdamm"
@@ -14937,20 +14971,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr "Redigera en överfallsdamm"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr "Vattenfall"
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr "Redigera ett vattenfall"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr "Vändplats"
@@ -14959,15 +14993,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr "Småbåtshamn"
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr "Redigera en småbåtshamn"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr "Pir"
@@ -14975,10 +15009,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr "Redigera pir"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr "Färjeterminal"
@@ -14986,10 +15020,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr "Redigera en färjeterminal"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr "Slip"
@@ -14999,5 +15033,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr "Redigera en slip"
@@ -15005,10 +15039,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr "Järnväg"
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr "Järnväg"
@@ -15016,5 +15050,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr "Redigera en järnväg"
@@ -15044,8 +15078,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr "Valfria typer"
@@ -15059,35 +15093,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr "bangård"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr "sidospår"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr "stickspår"
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr "Smalspår"
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr "Redigera en smalspårig järnväg"
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr "monorail"
@@ -15095,45 +15129,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr "Redigera en monorailbana"
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr "Museijärnväg"
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr "Redigera en museijärnväg"
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr "Tunnelbana"
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr "Redigera en tunnebana"
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr "Spårvagn"
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr "Redigera en spårväg"
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr "Spårbussväg"
@@ -15141,5 +15175,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr "Redigera en spårbussväg"
@@ -15148,14 +15182,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr "Järnväg utan trafik"
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr "Redigera en järnväg utan trafik"
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr "Nedlagd järnväg"
@@ -15164,5 +15198,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr "Plankorsning"
@@ -15171,5 +15205,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr "Järnvägsövergång"
@@ -15179,5 +15213,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr "Typ av övergångsställe"
@@ -15185,5 +15219,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr "Vändskiva"
@@ -15192,10 +15226,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr "Linbana"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr "Stollift"
@@ -15203,10 +15237,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr "Redigera en stollift"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr "Släplift"
@@ -15214,10 +15248,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr "Redigera en släplift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr "Linbana"
@@ -15225,10 +15259,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr "Redigera linbana"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr ""
@@ -15236,5 +15270,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr ""
@@ -15242,5 +15276,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr "Station"
@@ -15251,10 +15285,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr "Redigera station"
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr "Bränsle"
@@ -15264,5 +15298,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr "Redigera bränsle"
@@ -15278,5 +15312,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15286,5 +15320,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr "Redigera en parkeringsplats"
@@ -15292,41 +15326,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr "Kapacitet"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr "ytbeläggning"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr "flervånings-"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr "underjordisk"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr "Handikappplatser"
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr "Avgift"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr "Biltvätt"
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr "Redigera en biltvätt"
@@ -15334,5 +15368,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr "Affär"
@@ -15340,15 +15374,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr "Redigera bilförsäljare"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr "Bilverkstad"
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr "Redigera en bilverkstad"
@@ -15356,5 +15390,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr "Uthyrning"
@@ -15363,10 +15397,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr "Redigera biluthyrning"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr "Bilpool"
@@ -15374,5 +15408,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr "Redigera bilpool"
@@ -15380,5 +15414,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr "Redigera en cykelparkering"
@@ -15387,5 +15421,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr "Redigera en cykeluthyrning"
@@ -15394,15 +15428,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr "Redigera cykelaffär"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "Kollektivtrafik"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr "UIC-klassificering"
@@ -15410,5 +15444,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr "Järnvägshållplats"
@@ -15416,5 +15450,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr "Redigera hållplats"
@@ -15422,5 +15456,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr "Spårvagnshållplats"
@@ -15429,5 +15463,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr "Redigera spårvagnshållplats"
@@ -15435,5 +15469,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr "Plattform"
@@ -15442,5 +15476,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr "Redigera plattform"
@@ -15452,5 +15486,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr "Referens (spårnummer)"
@@ -15458,10 +15492,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr "Område"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr "Tunnelbaneingång"
@@ -15470,10 +15504,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr "Redigera tunnelbaneingång"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr "Rullstol"
@@ -15482,5 +15516,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr "Bussterminal"
@@ -15489,5 +15523,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr "Redigera en bussterminal"
@@ -15495,5 +15529,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr "Busshållplats"
@@ -15503,5 +15537,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr "Redigera en busshållplats"
@@ -15512,6 +15546,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr "VIndskydd"
@@ -15519,10 +15553,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr "Bussplattform"
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr "Redigera en bussplattform"
@@ -15530,5 +15564,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr "Taxi"
@@ -15536,5 +15570,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr "Redigera en taxistation"
@@ -15542,5 +15576,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr "Flygplats"
@@ -15548,15 +15582,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr "ICAO"
@@ -15565,5 +15599,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr "Logi"
@@ -15575,5 +15609,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotell"
@@ -15582,15 +15616,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr "Redigera ett hotell"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr "Stjärnor"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr "Motell"
@@ -15598,20 +15632,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr "Redigera ett motell"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr "Pensionat"
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr "Redigera pensionat"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr "Fäbod"
@@ -15619,10 +15653,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr "Redigera fäbod"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr "Vandrarhem"
@@ -15630,30 +15664,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr "Redigera ett vandrarhem"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr "Alphydda"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr "Redigera alphydda"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr "Husvagnscamping"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr "Redigera en husvagnscamping"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr "Campingplats"
@@ -15661,10 +15695,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr "Redigera en campingplats"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "Mat+Dryck"
@@ -15675,5 +15709,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurang"
@@ -15681,5 +15715,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr "Redigera en restaurang"
@@ -15687,5 +15721,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr "Kök"
@@ -15693,61 +15727,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr "italienskt"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr "kinesiskt"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr "hamburgare"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr "grekiskt"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr "tyskt"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr "indiskt"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr "lokalt"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr "turkiskt"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr "asiatiskt"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr "thailändskt"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr "mexikanskt"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr "japanskt"
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr "Snabbmat"
@@ -15755,9 +15789,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr "Redigera en snabbmatsrestaurang"
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr "Kafé"
@@ -15765,10 +15799,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr "Redigera kafé"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr "Pub"
@@ -15776,20 +15810,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr "Redigera pub"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr "Redigera Biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr ""
@@ -15797,10 +15831,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr "Nattklubb"
@@ -15808,20 +15842,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr "Redigera nattklubb"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "Turism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr "Sevärdhet"
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr "Redigera sevärdhet"
@@ -15830,11 +15864,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr "Öppettider"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "Museum"
@@ -15842,10 +15876,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr "Redigera museum"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "Zoo"
@@ -15854,10 +15888,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr "Redigera zoo"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr "Utsiktsplats"
@@ -15865,25 +15899,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr "Redigera utsiktsplats"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr "Utsiktstorn"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr "Nöjespark"
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr "Redigera en nöjespark"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr "Konst"
@@ -15891,5 +15925,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr "Redigera konstverk"
@@ -15897,5 +15931,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr ""
@@ -15903,80 +15937,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr ""
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "Karta"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr ""
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr "karta"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr "stadskarta"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr "vandringskarta"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr "cykelkarta"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
 msgid "Closer Description"
 msgstr ""
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1701
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Board Type"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "board"
 msgstr ""
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "history"
 msgstr "historiskt"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "nature"
 msgstr "naturfenomen"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "wildlife"
 msgstr "djurliv"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Guidepost (Hiking)"
 msgstr ""
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr "Redigera vindskydd"
@@ -15984,25 +16018,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr "Eldstad"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr "Picknickplats"
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr "Redigera picknickplats"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "Historiska platser"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "Slott"
@@ -16011,20 +16045,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr "Redigera slott"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr "Redigera ruiner"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr "Utgrävningsplats"
@@ -16033,10 +16067,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr "Redigera utgrävningsplats"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr "Krigsskådeplats"
@@ -16044,5 +16078,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr "Redigera krigsskådeplats"
@@ -16050,15 +16084,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr "Redigera monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr "Minnesmärke"
@@ -16066,45 +16100,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr "Redigera minnesmärke"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr "Vägkors"
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr "Redigera ett vägkors"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr "Vägaltare"
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr "Redigera ett vägaltare"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "Nöje"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr "Badanläggning"
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr "Redigera badanläggning"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "Lekplats"
@@ -16112,15 +16146,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr "Redigera lekplats"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "Fiske"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr "Redigera fiske"
@@ -16128,15 +16162,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr "Sportfaciliteteter"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr "Redigera stadion"
@@ -16150,6 +16184,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "välj sport:"
@@ -16172,4 +16206,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -16230,5 +16272,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16238,5 +16288,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16382,5 +16432,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16486,5 +16536,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16525,29 +16575,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr "sport"
@@ -16557,227 +16608,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr "flera"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr "bågskytte"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr "friidrott"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr "australisk fotboll"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr "basket"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr "boule"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr "kanot"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr "klättring"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr "kricket_nät"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr "krocket"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr "cykling"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr "hundracing"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr "ridsport"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr "amerikansk fotboll"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr "gymnastik"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr "ishockey"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr "hästkapplöpning"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr "motorsport"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr "rackets"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr "skytte"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr "skridskoåkning"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr "skidåkning"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "fotboll"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr "simning"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr "Sporthall"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr "Redigera sporthall"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr "Plan"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr "Redigera plan"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr "Bana"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr "Redigera bana"
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr "Golfbana"
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr "Redigera golfbana"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr "Redigera minigolfbana"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr "Flera"
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr "Redigera flersportsfacilitet"
@@ -16816,191 +16867,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr "plan"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr "sporthall"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr "Friidrott"
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr "Redigera friidrott"
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr "Bågskytte"
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr "Redigera bågskytte"
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr "Klättring"
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr "Redigera klättring"
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr "Kanotpaddling"
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr "Redigera kanotpaddling"
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr "Cykling"
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr "Redigera cykling"
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr "Hundkapplöpning"
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr "Redigera hundkapplöpning"
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr "Ridsport"
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr "Redigera ridsport"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr "Hästkapplöpning"
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr "Redigera hästkapplöpning"
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr "Redigera gymnastik"
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr "Redigera motorsport"
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr "Skridskoåkning"
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr "Redigera skridskoåkning"
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr "Redigera skateboard"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr "Simning"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr "Redigera simning"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr "Skidåkning"
@@ -17008,56 +17059,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr "Redigera skidåkning"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr "Skidspårstyp"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr "utförsåkning"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr "längdskidåkning"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr "Svårighetsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr "nybörjare"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr "lätt"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr "ospårat"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr "Skytte"
@@ -17065,178 +17116,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr "Redigera skytte"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr "Bollsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr "Fotboll"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr "Redigera fotboll"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr "Amerikansk fotboll"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr "Redigera amerikansk fotboll"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr "Australisk fotboll"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr "Redigera australisk fotboll"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr "Redigera baseball"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr "Basket"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr "Redigera basket"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr "Redigera golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr "golf_bana"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr "Redigera boule"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr "Redigera cricket"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr "Cricketnät"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr "Redigera cricketnät"
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr "Redigera krocket"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr "Ishockey"
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr "Redigera ishockey"
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr "Redigera pelota"
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr "Rackets"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr "Redigera rackets"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr "Redigera rugby"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr "Redigera bordtennis"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr "Redigera tennis"
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "Byggnader"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr "Byggnad"
@@ -17244,5 +17295,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "Offentlig byggnad"
@@ -17250,10 +17301,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr "Redigera offentlig byggnad"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "Stadshus"
@@ -17261,10 +17312,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "Redigera stadshus"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "Ambassad"
@@ -17272,10 +17323,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "Redigera ambassad"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "Domstol"
@@ -17284,10 +17335,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "Redigera domstol"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "Fängelse"
@@ -17296,10 +17347,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "Redigera fängelse"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "Polisstation"
@@ -17309,10 +17360,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "Redigera polisstation"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "Brandstation"
@@ -17321,10 +17372,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "Redigera brandstation"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "Postkontor"
@@ -17332,5 +17383,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr "Redigera postkontor"
@@ -17338,15 +17389,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr "Barndaghem"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr "Redigera barndaghem"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "Skola"
@@ -17354,10 +17405,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "Redigera skola"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr "Högskola/universitet"
@@ -17365,10 +17416,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr "Redigera högskola/universitet"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr "Högskola"
@@ -17376,5 +17427,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr "Redigera högskola"
@@ -17382,5 +17433,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "Biograf"
@@ -17389,10 +17440,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "Redigera biograf"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "Bibliotek"
@@ -17401,10 +17452,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "Redigera bibliotek"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr "Konstcenter"
@@ -17412,10 +17463,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr "Redigera konstcenter"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "Teater"
@@ -17424,10 +17475,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "Redigera teater"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr "Religiös helgedom"
@@ -17437,5 +17488,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr "Redigera religiös helgedom"
@@ -17444,6 +17495,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr "Religion"
@@ -17452,66 +17503,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr "buddism"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr "kristendom"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr "hinduism"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr "judendom"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr "islam"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr "daoism"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr "zoroastrianism"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr "Samfund"
@@ -17520,81 +17571,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr "anglikaner"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr "baptister"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr "katoliker"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr "evangelister"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr "jehovas_vittnen"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr "luteraner (inkl. Svenska kyrkan)"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr "metodister"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr "mormoner"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr "ortodoxa"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr "pinstvänner"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr "presbytarianer"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr "protestanter"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr "kväkare"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr "shiamuslimer"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr "sunnimuslimer"
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr "Adresser"
@@ -17603,5 +17654,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr "Redigera adressinformation"
@@ -17609,5 +17660,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr "Husnummer"
@@ -17615,20 +17666,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr "Husnamn"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr "Stadsnamn"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr "Landskod"
@@ -17636,5 +17687,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr "Adressinterpolation"
@@ -17643,5 +17694,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr "Redigera adressinterpolation"
@@ -17649,71 +17700,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr "Numreringsschema"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr "udda"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr "jämn"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr "alla"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr "Byggnadsverk"
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr "Fabrik"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr "Redigera fabriksbyggnad"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "Torn"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "Redigera torn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "Vattentorn"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "Redigera vattentorn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr "Gasklocka"
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr "Redigera gasklocka"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "Fyrtorn"
@@ -17721,10 +17772,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "Fyrtorn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "Väderkvarn"
@@ -17732,10 +17783,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "Redigera väderkvarn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "Rörledning"
@@ -17743,10 +17794,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "Redigera rörledning"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr "Reningsverk"
@@ -17756,10 +17807,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr "Redigera reningsverk"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr "Kran"
@@ -17767,10 +17818,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr "Redigera kran"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr "Fyrbåk"
@@ -17778,10 +17829,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr "Redigera fyrbåk"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr "Mätpunkt"
@@ -17789,10 +17840,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr "Redigera mätpunkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr "Övervakning"
@@ -17800,5 +17851,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr "Redigera övervakningskamera"
@@ -17806,5 +17857,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr "Kraftverk"
@@ -17814,39 +17865,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr "Redigera ett kraftverk"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr "vindkraft"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr "vattenkraft"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr "fossila bränslen"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr "kärnkraft"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr "kolkraft"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr "solkraft"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr "naturgas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr "Kraftstation"
@@ -17855,10 +17906,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr "Redigera en kraftstation"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -17867,5 +17918,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr "Redigera en transformatorstation"
@@ -17873,10 +17924,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr "Kraftledningsmast"
@@ -17887,5 +17938,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr "Redigera en kraftledningsmast"
@@ -17893,5 +17944,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr "Kraftledning"
@@ -17900,25 +17951,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr "Redigera en kraftledning"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr "Spänning"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr "Antal kablar"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr "Inrättningar"
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "Toaletter"
@@ -17926,20 +17977,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr "Referensnummer"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr "Anteckning"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr "Brevlåda"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "Telefon"
@@ -17948,5 +17999,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr "Redigera en telefon"
@@ -17954,5 +18005,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "Mynt"
@@ -17960,5 +18011,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr "Anteckningar"
@@ -17966,5 +18017,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr "Betalkort"
@@ -17972,5 +18023,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr "Kontokort"
@@ -17978,15 +18029,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr "Återvinning"
@@ -17995,5 +18046,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr "Redigera en återvinningsstation"
@@ -18001,35 +18052,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr "Burkar"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr "Kläder"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr "Papper"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr "Metallskrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr "Bänk"
@@ -18038,20 +18089,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr "Jakttorn"
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr "Redigera ett jakttorn"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr "Dölj"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr "Lås"
@@ -18059,22 +18110,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr "Höjd"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr "låg"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr "Fontän"
@@ -18083,10 +18134,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr "Redigera en fontän"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "Dricksvatten"
@@ -18095,10 +18146,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "Redigera dricksvattensfacilitet"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr ""
@@ -18106,25 +18157,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "Affärer"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr "Stormarknad"
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr "Redigera stormarknad"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr "Närköp"
@@ -18132,10 +18183,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr "Redigera närköp"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -18143,10 +18194,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr "Redigera kiosk"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "Automat"
@@ -18154,5 +18205,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "Redigera en automat"
@@ -18160,88 +18211,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "Varor till försäljning"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr "biljetter för allmänna transportmedel"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr "parkeringsbiljetter"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr "mat"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "dryck"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr "godis"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr "cigaretter"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr "foton"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr "djurmat"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "tidningar"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "leksaker"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr "frimärken"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr "tamponger"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr "hundpåsar"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "Slakteri"
@@ -18249,10 +18300,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "Redigera slakteri"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "Bageri"
@@ -18260,10 +18311,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "Redigera bageri"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr "Florist"
@@ -18271,20 +18322,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr "Redigera florist"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr ""
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr ""
@@ -18292,60 +18343,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr ""
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr "Drycker"
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr ""
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr "Dator"
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr "Redigera datoraffär"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr "Electronik"
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr "Redigera elektronikaffär"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr "Redigera hifi-affär"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr "Möbler"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr "Redigera möbelaffär"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr "Trädgårdscenter"
@@ -18353,10 +18404,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr "Redigera trädgårdscenter"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr "Järnvaror"
@@ -18364,10 +18415,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr "Redigera järnaffär"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr "Gör-det-själv-affär"
@@ -18375,60 +18426,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr "Redigera gör-det-själv-affär"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr "Kontorsmaterial"
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr "Redigera pappershandel"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr "Hårfrisör"
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr "Redigera hårfrisör"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr "Skor"
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr "Redigera skoaffär"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr "Leksaker"
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr "Redigera leksaksaffär"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr "Videobutik"
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr "Redigera videobutik"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "Kemtvätt"
@@ -18436,10 +18487,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "Redigera kemtvätt"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "Tvätteri"
@@ -18447,10 +18498,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "Redigera tvätteri"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr "Friluftsliv"
@@ -18458,35 +18509,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr "Redigera affär för friluftsliv"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr "Redigera sportaffär"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr "Redigera optiker"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "Pengar"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "Bank"
@@ -18494,5 +18545,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "Redigera bank"
@@ -18500,10 +18551,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "Uttagsautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr "Växlingskontor"
@@ -18511,5 +18562,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr "Redigera växlingskontor"
@@ -18517,15 +18568,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "Redigera uttagsautomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "Hälsovård"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr "Läkare"
@@ -18533,20 +18584,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr "Redigera läkare"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr "Tandläkare"
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr "Redigera tandläkare"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -18554,5 +18605,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "Redigera apotek"
@@ -18560,10 +18611,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr "Receptutlämnande"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "Sjukhus"
@@ -18571,10 +18622,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "Redigera sjukhus"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr ""
@@ -18583,5 +18634,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -18590,20 +18641,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr "Använd internationellt format, ex +12-345-67890"
@@ -18611,5 +18662,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr "Veterinär"
@@ -18618,56 +18669,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr "Redigera veterinär"
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr "Redigera en kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr "Redigera land"
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr "Delstat"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr "Redigera delstat"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr "Region"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr "Redigera region"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr "Län"
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr "Redigera län"
@@ -18675,15 +18725,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr "Stad"
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr "Redigera stad"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr "Småstad"
@@ -18691,10 +18741,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr "Redigera småstad"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr "Förort"
@@ -18702,25 +18752,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr "Redigera förort"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "Mindre tätort"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "Redigera mindre tätort"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr "Småort"
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr "Redigera småort"
@@ -18728,5 +18778,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr "Plats"
@@ -18734,10 +18784,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr "Redigera plats"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "Ö"
@@ -18745,5 +18795,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "Redigera ö"
@@ -18751,5 +18801,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr "Grottöppning"
@@ -18757,10 +18807,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr "Redigera en grottöppning"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "Topp"
@@ -18768,10 +18818,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "Redigera topp"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr "Glaciär"
@@ -18779,10 +18829,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr "Redigera en glaciär"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr "Vulkan"
@@ -18790,70 +18840,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr "Redigera en vulkan"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr "Gränser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr "Nationella"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr "Redigera nationsgränser"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr "Administrativ"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr "Redigera administrativa gränser"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr "Civilrättslig"
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr "Redigera en civilrättslig gräns"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr "Redigera politiska gränser"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr "Redigera gräns för nationalpark"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr "Markanvändning"
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "Träd"
@@ -18862,15 +18912,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "Redigera ett träd"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr "Botaniskt namn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr "Naturskog"
@@ -18879,5 +18929,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr "Redigera naturskog"
@@ -18885,17 +18935,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr "barrskog"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr "lövskog"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr "blandskog"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "Kulturskog"
@@ -18904,14 +18954,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr "Redigera användning av mark för skogsbruk"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr "Redigera naturreservat"
@@ -18919,25 +18969,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr "Bergsluttning (med lösa stenar)"
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr "Redigera bergssluttning (med lösa stenar)"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr "Buskage"
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr "Redigera buskage"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr "Höglandshed"
@@ -18945,10 +18995,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr "Redigera en höglandshed"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr "Hed"
@@ -18956,5 +19006,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr "Redigera hed"
@@ -18962,5 +19012,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr "Gårdsplan"
@@ -18969,45 +19019,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr "Redigera markanvändning som gårdsplan"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr "Jordbruksmark"
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr "Redigera användning av mark för jordbruk"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr "Äng"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr "Redigera markanvändning som äng"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr "Redigera användning av mark för vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr "Kolonilotter"
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr "Redigera användning av mark för koloniområden"
@@ -19015,25 +19065,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr "Trädgård"
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr "Redigera trädgård"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr "Gräs"
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr "Redigera markanvändning som gräsyta"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr "Allmänning"
@@ -19041,10 +19091,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr "Redigera användning av mark för allmänning"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr "Allmänning"
@@ -19052,20 +19102,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr "Redigera allmänning"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr "Redigera park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr "Fritidsområde"
@@ -19073,5 +19123,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr "Redigera användning av mark för fritidsområde"
@@ -19079,15 +19129,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr "Bostadsområde"
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr "Redigera användning av mark för bostadsområde"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr "Kyrkogård"
@@ -19095,9 +19145,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr "Redigera kyrkogård"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr "Begravningsplats"
@@ -19105,39 +19155,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr "Redigera användning av mark för begravningsplats"
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr "Detaljhandel"
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr "Redigera användning av mark för detaljhandel"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr "Affärsområde"
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr "Redigera användning av mark för affärsområde"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr "Industriområde"
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr "Redigera användning av mark för industriområde"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr "Järnvägsmark"
@@ -19145,15 +19195,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr "Redigera användning av mark för järnvägsmark"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr "Militärt område"
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr "Redigera användning av mark för militärt område"
@@ -19161,55 +19211,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr "Byggnadsplats"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr "Redigera markanvändning som byggnadsplats"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr "Deponi"
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr "Redigera användning av mark för deponi av avfall"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr "Stenbrott"
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr "Redigera användning av mark för stenbrott"
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -19219,5 +19269,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr "Redigera en multipolygon"
@@ -19226,10 +19276,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr "yttre segement"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr "inre segment"
@@ -19237,5 +19287,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr ""
@@ -19244,5 +19294,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -19250,34 +19300,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr "Begränsning"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr "ingen_vänstersväng"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr "ingen_högersväng"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr "inte_rakt_fram"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr "ingen_u_sväng"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr "enbart_högersväng"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr "enbart_vänstersväng"
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr "enbart_rakt_fram"
@@ -19286,15 +19336,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr "från sträcka"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr "via nod eller sträcka"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr "till sträcka"
@@ -19302,5 +19352,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr ""
@@ -19309,5 +19359,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr ""
@@ -19315,5 +19365,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr ""
@@ -19385,24 +19435,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr "cykel"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr ""
@@ -19455,20 +19505,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr "fot"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr ""
@@ -19482,10 +19532,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr "tunnelbana"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr ""
@@ -19493,26 +19543,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr ""
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "Rotera"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr ""
@@ -19521,30 +19577,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr ""
@@ -19580,6 +19636,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19595,5 +19652,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19612,5 +19677,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr ""
@@ -19704,7 +19769,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr "bro"
@@ -19969,15 +20034,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr "förlegad"
@@ -20019,5 +20084,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr "häst"
@@ -20155,4 +20220,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20164,5 +20235,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20170,5 +20241,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20205,5 +20276,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20227,11 +20298,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr ""
@@ -20255,5 +20326,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20294,5 +20365,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20330,6 +20401,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr "gata"
@@ -20385,7 +20456,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr "landsvägsspår"
@@ -20438,11 +20509,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr "räls"
@@ -20463,5 +20542,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr ""
@@ -20475,5 +20554,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr ""
@@ -20494,5 +20573,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr "vändplats"
@@ -20506,6 +20585,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr ""
@@ -20520,5 +20599,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr "flodbank"
@@ -20532,5 +20611,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr "bäck"
@@ -20544,5 +20623,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr "hamn"
@@ -20570,5 +20649,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr "akvedukt"
@@ -20711,5 +20790,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20736,13 +20815,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr "byggnadsverk"
@@ -20804,7 +20883,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr "järnvägspunkt"
@@ -20827,10 +20906,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr ""
@@ -20866,7 +20945,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr ""
@@ -20911,6 +20990,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr ""
@@ -20924,5 +21003,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr "terminal"
@@ -20944,5 +21023,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr ""
@@ -20956,5 +21035,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr ""
@@ -20962,4 +21041,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21002,7 +21088,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr "linbana"
@@ -21019,5 +21105,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr ""
@@ -21032,5 +21118,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr ""
@@ -21045,5 +21131,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr ""
@@ -21058,5 +21144,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr ""
@@ -21071,5 +21157,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr ""
@@ -21084,5 +21170,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr ""
@@ -21105,4 +21191,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -21113,4 +21206,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -21187,10 +21288,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr "kraft"
@@ -21204,5 +21306,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr "pir"
@@ -21216,5 +21318,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr "rörledning"
@@ -21342,12 +21444,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr "fritid"
@@ -21361,5 +21463,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr "marina"
@@ -21431,8 +21533,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr "inrättning"
@@ -21534,10 +21636,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr "trafikinrättning"
@@ -21557,4 +21659,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21576,4 +21685,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21897,4 +22013,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -21921,24 +22045,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr ""
@@ -21970,6 +22102,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr ""
@@ -22030,8 +22162,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr "hälsa"
@@ -22384,26 +22516,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr "affär"
@@ -22458,5 +22590,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22475,8 +22607,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr "hotell"
@@ -22626,9 +22758,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr "turism"
@@ -22700,8 +22832,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr "historisk"
@@ -22772,8 +22904,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr ""
@@ -22787,5 +22919,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr "stenbrott"
@@ -22799,5 +22931,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr ""
@@ -22819,5 +22951,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr "hamnbassäng"
@@ -22831,5 +22963,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr "skog"
@@ -22843,5 +22975,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr "gårdsplan"
@@ -22864,5 +22996,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr "detaljhandel"
@@ -22876,5 +23008,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr "industri"
@@ -22888,5 +23020,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr ""
@@ -22900,5 +23032,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr ""
@@ -22912,5 +23044,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr ""
@@ -22967,7 +23099,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr "militär"
@@ -22981,5 +23113,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr "begravningsplats"
@@ -22992,5 +23124,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr "topp"
@@ -23005,5 +23137,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr "glaciär"
@@ -23017,5 +23149,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr "vulkan"
@@ -23070,8 +23202,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr "naturfenomen"
@@ -23085,5 +23217,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr "buskage"
@@ -23097,5 +23229,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr "hed"
@@ -23109,5 +23241,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr "skog"
@@ -23121,5 +23253,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr "lera"
@@ -23133,5 +23265,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr "strand"
@@ -23209,8 +23341,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr "rutt"
@@ -23258,7 +23390,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr "gräns"
@@ -23400,10 +23532,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr "plats"
@@ -23451,6 +23583,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr "adress"
@@ -23747,42 +23879,30 @@
 msgstr ""
 
+#~ msgid "Move"
+#~ msgstr "Flytta"
+
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
+
+#~ msgid "unnamed"
+#~ msgstr "namnlös"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM-användarnamn (email)"
+
+#~ msgid "Aborting..."
+#~ msgstr "Avbryter..."
+
+#~ msgid "Not implemented yet."
+#~ msgstr "Inte implementerat ännu."
+
 #~ msgid "Unknown file extension."
 #~ msgstr "Okänd filändelse."
 
-#~ msgid "Move"
-#~ msgstr "Flytta"
-
-#~ msgid "Invalid projection"
-#~ msgstr "Ogiltig kartprojektion"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "Ändra projektionen till {0} först."
-
-#~ msgid "end"
-#~ msgstr "slut"
-
-#~ msgid "Email"
-#~ msgstr "Email"
-
-#~ msgid "Object"
-#~ msgstr "Objekt"
-
-#~ msgid "unnamed"
-#~ msgstr "namnlös"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM-användarnamn (email)"
-
-#~ msgid "Aborting..."
-#~ msgstr "Avbryter..."
-
-#~ msgid "Not implemented yet."
-#~ msgstr "Inte implementerat ännu."
-
 #~ msgid "Change"
 #~ msgstr "Ändra"
-
-#~ msgid "Rotate"
-#~ msgstr "Rotera"
 
 #~ msgid "Resolve {0} conflicts in {1} objects"
@@ -23906,4 +24026,7 @@
 #~ "Zooma: Mushjul eller dubbelklickning. Flytta karta: Håll nere höger "
 #~ "musknapp och flytta musen. Välj: Klicka"
+
+#~ msgid "end"
+#~ msgstr "slut"
 
 #~ msgid "Commit comment"
@@ -24131,4 +24254,10 @@
 #~ "fortsätta?"
 
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "Ändra projektionen till {0} först."
+
+#~ msgid "Invalid projection"
+#~ msgstr "Ogiltig kartprojektion"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Redigera en klaffbro"
Index: /applications/editors/josm/i18n/po/tr.po
===================================================================
--- /applications/editors/josm/i18n/po/tr.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/tr.po	(revision 17069)
@@ -10,6 +10,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
-"PO-Revision-Date: 2009-08-04 10:56+0000\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
+"PO-Revision-Date: 2009-08-10 13:34+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\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: 2009-08-10 11:58+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -58,6 +58,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -102,6 +102,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "Hata"
@@ -112,5 +112,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "Saklanılmayan Çalışmalar"
@@ -130,10 +130,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -150,15 +150,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -188,6 +188,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -217,5 +217,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -371,5 +371,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
 msgstr ""
@@ -453,9 +453,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -488,7 +488,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -569,37 +569,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "bilgi"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "tabaka"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "selection"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "Çelişki"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "{0} a Yaklaş"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Görünümü {0} a yaklaştır."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -609,30 +609,30 @@
 msgstr "Görüntü: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "Yaklaşılacak bir şey yok."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "Yaklaşılacak çelişki yok"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "Yolları Birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "Çeşitli yolları birine birleştir."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "Lütfen birleştirmek için en az iki yol seçiniz."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr "Farklı sınıflardaki yolları birleştir?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -642,13 +642,13 @@
 "istiyormusunuz?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "Yöneleri değiştir?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -658,10 +658,10 @@
 "istermisiniz?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -669,20 +669,20 @@
 msgstr "Bütün çelişkilere değer ver."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "{0} yolu birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "Bütün yollar boştu"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -727,6 +727,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -748,6 +748,6 @@
 msgstr "Seçili Objeleri Sil."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -757,5 +757,5 @@
 msgstr "Üzerine Yaz"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -887,7 +887,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "GPX dosyasına çevir."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -903,5 +902,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -919,5 +918,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -989,22 +988,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "Kavşakları Birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "Kavşakları en yaşlı olana birleştir."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "Lütfen birleşim için en az iki kavşak seçiniz."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr "Farklı özellikli kavşakları birleştir?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1012,13 +1011,13 @@
 msgstr "Seçili kavşaklar, farklı ilişkileri var. Birleştirmek istiyormusun?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "Kavşaklar birleştirlemiyor: Kullanılan bir yolun silinmesi gerekiyor."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1273,7 +1272,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "Döküman açık değil Kayıt yapılamaz."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1859,5 +1857,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1869,5 +1867,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr ""
@@ -1906,11 +1904,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2051,5 +2049,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2124,5 +2122,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Objeleri ara."
@@ -2246,5 +2244,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Arama"
@@ -2444,5 +2442,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2485,5 +2483,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr ""
@@ -2524,8 +2522,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "{0} Kavşak birleştirildi"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2561,8 +2560,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "{0} Kavşak"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2726,7 +2726,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "{0} Objeyi Değiştir"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2736,5 +2736,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2779,5 +2779,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2809,5 +2809,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2820,5 +2820,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "demiryolu"
@@ -2833,5 +2833,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3109,5 +3109,5 @@
 msgstr "Tekrar Gösterme"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3116,5 +3116,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3124,10 +3124,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3135,25 +3135,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3163,9 +3163,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3174,9 +3174,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "Beklenmedik Durum"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3186,9 +3198,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "Tanımsız host"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3198,5 +3210,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr ""
@@ -3287,10 +3299,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "KullanıcıAdı"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "şifre"
@@ -3494,15 +3506,15 @@
 msgstr "(obje yok)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "tabaka listede yok."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3556,5 +3568,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr ""
@@ -3563,5 +3575,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr ""
@@ -3570,20 +3582,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3593,6 +3605,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3600,6 +3612,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3607,40 +3619,40 @@
 msgstr "Üyeler"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3648,74 +3660,74 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3723,30 +3735,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3754,5 +3766,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3760,13 +3772,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3774,5 +3786,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3780,21 +3792,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3803,27 +3815,27 @@
 msgstr "Çıkart"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3831,5 +3843,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3838,5 +3850,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3845,5 +3857,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3852,5 +3864,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -3859,21 +3871,21 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -3883,5 +3895,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -3891,5 +3903,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -3897,19 +3909,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -3918,19 +3930,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -3939,9 +3951,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -3951,13 +3963,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -3965,90 +3977,90 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "silindi"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4058,17 +4070,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4077,14 +4089,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4092,21 +4104,21 @@
 msgstr "Rol"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4114,14 +4126,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4129,7 +4141,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4141,7 +4153,7 @@
 msgstr "Anahtar"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4154,45 +4166,45 @@
 msgstr "Değer"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr ""
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4212,8 +4224,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4250,5 +4262,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4350,83 +4362,83 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "Tabakalar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "Yüklenilmiş olan tabakaların listesini göster."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "Seçili tabakayı sil."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "Göster/Sakla"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "Seçili tabakanın görünen kısmını sabitle."
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "Seçili tabakayı bir satır yukarı taşı."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "Seçili tabakayı bir satır aşağı taşı."
@@ -4436,6 +4448,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4443,22 +4455,22 @@
 msgstr[0] "İşlem {0} objeyi değiştirecek."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "Boş değer anahtarı sildi."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<farklı>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "Değerleri Değiştir?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4466,5 +4478,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4472,40 +4484,40 @@
 msgstr[0] "Değerleri {0} obje için değiştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "Lütfen bir anahtar seçiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "Lütfen bir değer seçiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 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/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "Özellikler/Üyelikler"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "Seçili objenin özellikleri"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "Üyesi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "Özellik Ekle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4522,39 +4534,39 @@
 msgstr "Ekle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 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/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "Özellikleri Değiştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 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/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Özellik: {0} / Üyelik: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "Özellik / Üyelik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "İlişkiyi değiştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, 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/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "Seçili anahtarı her objeden sil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "Özelliği Sil"
@@ -4566,5 +4578,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "İlişkiler"
@@ -4596,31 +4608,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "Güncel Seçim"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "Seçim listesi penceresini aç."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "Seçili eleman(lara) yakınlaş"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "Seçim listesini yenile."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "Seçime yakınlaş"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Seçim.: İlişki.:{0} / Yollar:{1} / Kavşaklar:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4628,5 +4640,5 @@
 msgstr "Seçim"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4634,5 +4646,5 @@
 msgstr[0] "{0} Yol"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4640,5 +4652,5 @@
 msgstr[0] "{0} İlişki"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -4848,7 +4860,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "Seçili ilişkiyi sil"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -4931,5 +4942,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5168,5 +5179,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "Yerler"
@@ -5213,21 +5224,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "tip"
@@ -6027,72 +6038,508 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "İsim"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr "{0} için görüntüler"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr "GPX Oku..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Noktalrı için {0} x {1} zaman yok"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Zaman şu noktalar  \"{0}\" {1} x {2} için okunamadı"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr "Zaman damgası okunabilen bir görüntü bulunamadı."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "{0} Okunuyor..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr "Geotagged Görüntüler"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS başlangıç: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS bitiş: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr "şu anki delta: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr "zaman dilimi farkı: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "görüntü"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} izde var."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "Saati eşle"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG görüntüsü (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "\"{0}\" dosyasındaki zaman ayrıştırılamadı."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "EXIF zamanı \"{0}\" dosyasında yok."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "Görüntü"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Gösterilecek tarihi giriniz (ay/gün/yıl saat:dakika:saniye)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr "GPS ünitesi zamandilimi (resim farkı)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr "Girilen zaman ayrıştırılamadı."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr "gps noktası"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "Çizimi özelleştir"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr "Genel ayarları kullan."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr "Bu tabaka için çizgiler arasını birleştir."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr "Bu tabaka için çizgileri birleştirme."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr "Çizim seçeneklerini seçiniz"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "Renkleri Ayarla"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Varsayılan"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Renk seç"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr "işaretli noktalardan imleçler"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "{0} isim verilen izler"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "Sesi içeri al"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave Audio files (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "{0} daki ses imleçleri"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "Görüntüleri içeri al"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} iz, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} rut, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} yol noktaları"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr "İsim: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr "Tanım: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr "Zaman_aralığı: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr "Uzunluk: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "Bilgi tabakasına çevir"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+msgid ""
+"<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 "
+"yüklemek isterseniz buraya bakınız:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Çevrildiği yer: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr "OSM den bu izi indir"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr "Bunun içindeki herşeyi indir:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr "{0} metre"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr "Her istek için max. alan:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km2"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Bu hareket {0} ayrı indirme<br> isteği gerektirir. <br>Devam etmek "
+"istiyor musunuz?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr "Tabakada ses ile ilişkilendirilecek GPX izi yok."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Bazı çok uzak yol noktaları, zaman hassiyetine uymadığı için çıkartıldı."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr "indirilen alanın dışında"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} şunları içerir:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} silindi.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr "GPX tabakasına çevir"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6101,7 +6548,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6111,441 +6558,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "İsim"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr "{0} için görüntüler"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr "GPX Oku..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Noktalrı için {0} x {1} zaman yok"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Zaman şu noktalar  \"{0}\" {1} x {2} için okunamadı"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr "Zaman damgası okunabilen bir görüntü bulunamadı."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "{0} Okunuyor..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr "Geotagged Görüntüler"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS başlangıç: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS bitiş: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr "şu anki delta: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr "zaman dilimi farkı: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "görüntü"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} izde var."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "Saati eşle"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG görüntüsü (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "\"{0}\" dosyasındaki zaman ayrıştırılamadı."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "EXIF zamanı \"{0}\" dosyasında yok."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "Görüntü"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Gösterilecek tarihi giriniz (ay/gün/yıl saat:dakika:saniye)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr "GPS ünitesi zamandilimi (resim farkı)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr "Girilen zaman ayrıştırılamadı."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr "gps noktası"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "Çizimi özelleştir"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "Genel ayarları kullan."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr "Bu tabaka için çizgiler arasını birleştir."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr "Bu tabaka için çizgileri birleştirme."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr "Çizim seçeneklerini seçiniz"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "Renkleri Ayarla"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Varsayılan"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Renk seç"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr "işaretli noktalardan imleçler"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "{0} isim verilen izler"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "Sesi içeri al"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave Audio files (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "{0} daki ses imleçleri"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "Görüntüleri içeri al"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} iz, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} rut, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} yol noktaları"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr "İsim: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr "Tanım: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr "Zaman_aralığı: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr "Uzunluk: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "Bilgi tabakasına çevir"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-msgid ""
-"<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 "
-"yüklemek isterseniz buraya bakınız:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Çevrildiği yer: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr "OSM den bu izi indir"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr "Bunun içindeki herşeyi indir:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr "{0} metre"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr "Her istek için max. alan:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km2"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Bu hareket {0} ayrı indirme<br> isteği gerektirir. <br>Devam etmek "
-"istiyor musunuz?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr "Tabakada ses ile ilişkilendirilecek GPX izi yok."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Bazı çok uzak yol noktaları, zaman hassiyetine uymadığı için çıkartıldı."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr "indirilen alanın dışında"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} şunları içerir:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} silindi.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr "GPX tabakasına çevir"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -6915,5 +6926,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "Araba"
@@ -6930,16 +6941,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "Bisiklet"
@@ -6967,14 +6980,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "Ayak"
@@ -7183,19 +7199,19 @@
 msgstr "Dil"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr "Önceden tanımlanmış ayarları etkinleştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr ""
@@ -7324,35 +7340,11 @@
 msgstr "Proxy server şifresi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr "OSM için asıl link"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr "OSM için login şifresi, herhangi şifre saklamamak için boş bırakınız."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "Asıl Link"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "OSM şifresi"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -7715,7 +7707,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "Okunamadı \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -7820,7 +7812,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "Tanımsız host"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -7978,22 +7970,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "Hatalı kullanıcı adı veya şifre."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Uyarı: Şifre düz metin olarak ileticektir."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "KullanıcıAdı ve şifreyi Sakla (Düz Metin Olarak)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr "OSM için login şifresi, herhangi şifre saklamamak için boş bırakınız."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "OSM şifresi"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
 
@@ -8157,14 +8173,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid "Unknown relation member type {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr "Yanlış tanımlı kavşak bilgisi"
@@ -8616,5 +8632,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr ""
@@ -9028,5 +9044,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr "Dosya Yüklemede Sorun"
@@ -9350,5 +9366,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -9886,7 +9902,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr "su"
@@ -10067,7 +10083,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "sism"
+msgstr ""
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10624,12 +10639,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "başla"
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0} Kavşak"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -10767,5 +10782,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr "Sokak Adı"
@@ -11589,7 +11604,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr "yapılar"
@@ -11603,5 +11618,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr "alan"
@@ -11836,12 +11851,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "Editlemek için bir satır seçiniz."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "WMS Tabakası"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
@@ -11854,7 +11867,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "Yüklenilecek değişiklik yok."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -11865,19 +11877,19 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr "Otomatik indir"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS tabaksı ({0}), otomatik indirildi, görüntü seviyesi {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS tabakası ({0}), görüntü seviyesi {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -11886,42 +11898,42 @@
 "değiştirin"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr "Görünen mozaikleri indir"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr "Çözünürlüğü değiştir"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr "WMS tabakasını dosyaya kaydet"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr "WMS tabakasını dosyadan yükle"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Desteklenmeyen WMS versiyonu; bulunan {0}, istenen {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr "Dosya Format Hatası"
@@ -12253,4 +12265,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12287,5 +12301,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr "Sokaklar"
@@ -12296,5 +12310,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Araçyolu"
@@ -12303,5 +12317,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr "Araçyolunu düzenle"
@@ -12328,8 +12342,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr "Referans"
@@ -12370,21 +12384,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr "Tabaka"
@@ -12398,8 +12412,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr "Şeritler"
@@ -12417,15 +12431,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr "Max. hız (km/sa)"
@@ -12462,16 +12476,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr "TekYol"
@@ -12513,19 +12527,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "köprü"
@@ -12561,19 +12575,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr "Tunel"
@@ -12607,18 +12621,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr "Kesen"
@@ -12652,18 +12666,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr "toprak set"
@@ -12671,5 +12685,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr "Araç yolu hattı"
@@ -12678,5 +12692,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr "araç yolu hattını düzenle"
@@ -12684,5 +12698,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr "Anayol"
@@ -12691,5 +12705,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr "Anayol düzenle"
@@ -12699,6 +12713,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr ""
@@ -12706,5 +12720,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr "Anayol Hattı"
@@ -12713,5 +12727,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr "Anayol Hattı düzünle"
@@ -12724,5 +12738,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Birincil"
@@ -12731,5 +12745,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr "Birincil yolu düzenle"
@@ -12737,10 +12751,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr "Birincil hat"
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr "Birincil hat düzenle"
@@ -12752,5 +12766,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "İkincil"
@@ -12760,5 +12774,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr "İkincil yol düzenle"
@@ -12766,5 +12780,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr "Üçüncül"
@@ -12774,5 +12788,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr "Üçüncül yolu düzenle"
@@ -12784,5 +12798,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "tanzim edilmemiş"
@@ -12792,5 +12806,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr "Sınıflandırılmamış yolu düzenle"
@@ -12817,19 +12831,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr ""
@@ -12841,5 +12855,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "yerleşim alanı"
@@ -12848,5 +12862,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr "yerleşim sokağını düzenle"
@@ -12870,13 +12884,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr "Yüzey"
@@ -12896,20 +12910,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr "kaldırım"
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr "kaldırımsız"
@@ -12917,12 +12931,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr "parke taşı"
@@ -12930,5 +12944,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr "Canlı Sokak"
@@ -12937,5 +12951,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr "Living Street düzenle"
@@ -12943,5 +12957,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr "Servis"
@@ -12950,5 +12964,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr "Servis yolu düzenle"
@@ -12958,18 +12972,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr ""
@@ -12977,5 +12991,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr "Park alanı"
@@ -12985,5 +12999,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr "Park alanı düzenle"
@@ -12991,5 +13005,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr "yol (tipi bilinmiyor)"
@@ -12998,5 +13012,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr "Tipi olmayan yolu düzenle"
@@ -13005,20 +13019,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr "Yol kısıtlamaları"
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr "Yol kısıtlamalarını düzenle"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr "ücret"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr "Çıkış Yok"
@@ -13031,8 +13045,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr "Erişim"
@@ -13076,23 +13090,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr "Evet"
@@ -13105,40 +13119,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr "özel"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr "atanmış"
@@ -13151,19 +13165,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr "varış"
@@ -13186,65 +13200,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr "ihtiyari"
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr "tarımsal"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr "hayır"
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr "mallar"
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Ağır araç"
@@ -13259,10 +13273,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr "AT"
@@ -13278,13 +13292,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr "Motosiklet"
@@ -13300,30 +13314,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr "otomobil"
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr "Toplu taşıma araçları"
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr "Motorboat"
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr "Boat"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr "Min. Hız (km/h)"
@@ -13331,25 +13345,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr "Max. ağırlık (ton)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr "DönerKavşak"
@@ -13360,5 +13374,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr "Kavşak Düzenle"
@@ -13380,9 +13394,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr "Tip"
@@ -13402,10 +13416,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr "araçyolu"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr "otoyol_hat"
@@ -13427,10 +13441,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr "ana_hat"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr "anayol_hat"
@@ -13452,10 +13466,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr "birincil"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr "birincil_hat"
@@ -13477,6 +13491,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr "ikincil"
@@ -13490,9 +13504,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr "üçüncül"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr "sınıflandırılmamış"
@@ -13506,9 +13520,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr "yerleşim_alanı"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr "canlı_sokak"
@@ -13538,10 +13552,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr "servis"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr "otobüs_hattı"
@@ -13549,4 +13563,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13564,6 +13585,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr "inşaat"
@@ -13574,10 +13595,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr "Köprü Düzenle"
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr ""
@@ -13585,19 +13606,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr "Yollar"
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr "İnşaat"
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr "Otoyolda onarım var olarak düzenle"
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr "Kavşak"
@@ -13613,5 +13634,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr "roundabout-döner kavşak"
@@ -13620,5 +13641,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr "At yolu"
@@ -13626,5 +13647,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr "At yolu düzenle"
@@ -13632,5 +13653,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr "Bisiklet yolu"
@@ -13640,5 +13661,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr "Bisiklet yolu düzenle"
@@ -13646,5 +13667,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr "Yürüyüş Yolu"
@@ -13653,5 +13674,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr "Yürüyüş Yolu Düzenle"
@@ -13659,5 +13680,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr "Yaya Yolu"
@@ -13666,5 +13687,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr "yaya yol sokağını düzenle"
@@ -13672,5 +13693,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr "adımlar"
@@ -13680,5 +13701,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr "Uçuş adımları düzenle"
@@ -13687,5 +13708,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr "İz"
@@ -13694,14 +13715,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr "İz düzenle"
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr "Çakıl"
@@ -13709,18 +13730,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr "toprak"
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr "ot"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr "kum"
@@ -13728,5 +13749,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr "İz derecesi 1"
@@ -13735,5 +13756,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr "İz derecesi 1 düzenle"
@@ -13741,5 +13762,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr "İz derecesi 2"
@@ -13748,5 +13769,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr "İz derecesi 2 düzenle"
@@ -13754,5 +13775,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr "İz derecesi 3"
@@ -13761,5 +13782,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr "İz derecesi 3 düzenle"
@@ -13767,5 +13788,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr "İz derecesi 4"
@@ -13774,5 +13795,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr "İz derecesi 4 düzenle"
@@ -13780,5 +13801,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr "İz derecesi 5"
@@ -13787,5 +13808,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr "İz derecesi 5 düzenle"
@@ -13794,5 +13815,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr "Yol"
@@ -13801,13 +13822,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr "Yol düzenle"
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr "kar motosikleti"
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr "Kayak"
@@ -13815,5 +13836,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr "gezme"
@@ -13823,5 +13844,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr "gezme düzenle"
@@ -13829,5 +13850,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr "Dağ gezisi"
@@ -13837,5 +13858,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr "Dağ gezisi düzenle"
@@ -13843,5 +13864,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr "istenen dağ gezisi"
@@ -13851,5 +13872,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr "istenen dağ gezisi düzenle"
@@ -13857,5 +13878,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr "Dağ Gezisi"
@@ -13865,5 +13886,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr "Dağ Gezisi düzenle"
@@ -13871,5 +13892,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr "istenen Dağ Gezisi"
@@ -13879,5 +13900,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr "istenen Dağ Gezisi düzenle"
@@ -13885,5 +13906,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr "Zor Dağ Gezisi"
@@ -13893,5 +13914,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Zor Dağ Gezisi düzenle"
@@ -13899,10 +13920,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr "Yol noktaları"
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr "Otoyol Kavşağı"
@@ -13910,15 +13931,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr "Otoyol Kavşağı birleştirme"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr "Numara"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr "Servis"
@@ -13926,5 +13947,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr "Sevis istasyonu düzenle"
@@ -13959,14 +13980,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr "Operator"
@@ -13975,5 +13996,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr "Trafik ışıkları"
@@ -13983,5 +14004,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -13990,27 +14011,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr "kontrolsuz"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr "ada"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr ""
@@ -14018,6 +14039,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr ""
@@ -14026,11 +14047,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -14038,30 +14059,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr "pelikan"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr "Dur"
@@ -14069,5 +14090,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -14076,14 +14097,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr ""
@@ -14094,14 +14115,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr "döner kavşak"
@@ -14111,20 +14132,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr "şehir sınırı"
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr "şehir sınırı düzenle"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr "ikinci isim"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr "hız kamerası"
@@ -14132,5 +14153,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr "Acil durum telefonu"
@@ -14138,5 +14159,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr ""
@@ -14144,5 +14165,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr ""
@@ -14151,10 +14172,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr "sığ geçit"
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr "sığ geçit düzenle"
@@ -14162,5 +14183,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr "Dağ geçidi"
@@ -14168,5 +14189,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr "dağ geçidi düzenle"
@@ -14178,7 +14199,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr "yükseklik"
@@ -14186,5 +14207,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr "Bariyer"
@@ -14192,5 +14213,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr "direk-iskele"
@@ -14198,5 +14219,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr "direk-iskele düzenle"
@@ -14235,18 +14256,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr "İzin verilen trafik:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr ""
@@ -14255,5 +14280,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr "Blok"
@@ -14261,5 +14286,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr "Hayvan Kapısı"
@@ -14267,10 +14292,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr "Hayvan Kapısı Düzenle"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr "otobüs geçidi"
@@ -14278,15 +14303,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr "Spikes"
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr "gişe"
@@ -14294,5 +14319,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr "gişe  düzenle"
@@ -14300,10 +14325,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr "Sınır kontrol noktası"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr "Sınır kontrol noktası düzenle"
@@ -14313,5 +14338,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr "Çalı Çit"
@@ -14320,5 +14345,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr "Çit"
@@ -14327,5 +14352,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr "Duvar"
@@ -14333,5 +14358,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr "Şehir Duvarı"
@@ -14340,5 +14365,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr "istinat duvarı"
@@ -14350,15 +14375,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr "Giriş"
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr "Giriş düzenle"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr "Geçit"
@@ -14366,50 +14391,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr "Geçit Düzenle"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr "Kalkan geçit"
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr "kalkan geçit düzenle"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr "Hampshire Geçidi"
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr "Hampshire Geçidi Düzenle"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr "Hız engeli"
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr "Hız engeli düzenle"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr "geçit"
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr "geçit düzenle"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr "Stil"
@@ -14417,15 +14442,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr "Stil düzenle"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+#, fuzzy
+msgid "Turnstile"
+msgstr "döner levha"
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "Stil düzenle"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr "Çıkış Kapısı-asker"
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr "Çıkış Kapısı-asker düzenle"
@@ -14436,10 +14473,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr "Su"
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr "Spring"
@@ -14447,5 +14484,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr "Spring Düzenle"
@@ -14453,5 +14490,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr "kanalizasyon"
@@ -14459,10 +14496,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr "kanalizasyon düzenle"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr "dere"
@@ -14470,10 +14507,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr "dere düzenle"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr "Kanal"
@@ -14481,10 +14518,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr "Kanal düzenle"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr "nehir"
@@ -14494,5 +14531,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr "nehir düzenle"
@@ -14500,15 +14537,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr "Su Düzenle"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr "Kara"
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr "Kara Düzenle"
@@ -14516,15 +14553,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr "havza"
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr "havza kullanım düzenle"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr "Havuz"
@@ -14532,15 +14569,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr "Havuz Kullanımı Düzenle"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr "Kapalı Sarnıç"
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr "Kapalı Sarnıç Düzenle"
@@ -14548,5 +14585,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr "Nehirkenarı"
@@ -14555,10 +14592,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr "Nehirkenarı Düzenle"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr "sulak alan"
@@ -14569,14 +14606,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr "sulak alan düzenle"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr "bataklık"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr "kenef"
@@ -14590,35 +14627,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr "batak"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr "sazlık alan"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr "çolak alan"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr "gelgit alanı"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr "bataklık ormanı"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr "Çamur"
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr "Çamur Alan Düzenle"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr "Sahil"
@@ -14626,20 +14663,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr "Sahil Düzenle"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr "Koy"
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr "koy Düzenle"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr "Uçurum"
@@ -14647,10 +14684,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr "Uçurum Düzenle"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr "Sahil Çizgisi"
@@ -14658,5 +14695,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr "Sahil Çizgisi Düzenle"
@@ -14664,5 +14701,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr "feribot hat"
@@ -14670,5 +14707,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr "feribot hat düzenle"
@@ -14677,5 +14714,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr "Marina"
@@ -14683,10 +14720,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr "Marina düzenle"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr "iskele"
@@ -14694,5 +14731,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr "iskele düzenle"
@@ -14700,5 +14737,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr "Baraj"
@@ -14706,15 +14743,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr "Baraj düzenle"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr "Su yolu noktası"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr "Lock Gate"
@@ -14723,5 +14760,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr "bent"
@@ -14729,20 +14766,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr "bent dünele"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr "şelale"
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr "şelale düzenle"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr "dönüm noktası"
@@ -14751,15 +14788,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr "Marina"
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr "Marina düzenle"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr "Kemer"
@@ -14767,10 +14804,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr "Kemer Düzenle"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr "Feribot Terminal"
@@ -14778,10 +14815,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr "Feribot Terminal düzenle"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr "Gemi Kızağı"
@@ -14791,5 +14828,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr "Gemi Kızağı Düzenle"
@@ -14797,10 +14834,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr "Demiryolu"
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr "Demiryolu"
@@ -14808,5 +14845,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr "Demiryolu düzenle"
@@ -14836,8 +14873,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr "seçmeli tipler"
@@ -14851,35 +14888,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr "saha"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr "yük boşaltma yeri"
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr "demiryolu hattı şube-kısa"
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr "Dar geçiş demiryolu"
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr "Dar geçiş demiryolu düzenle"
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr "tek ray"
@@ -14887,45 +14924,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr "tek ray düzenle"
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr "Korunmuş"
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr "Korunmuş demiryolu düzenle"
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr "Hafif Ray"
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr "Hafif Ray Düzenle"
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr "Metro"
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr "Metro Düzenle"
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr "Tramvay"
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr "Tramvay Düzenle"
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr "Otobüs Yolu"
@@ -14933,5 +14970,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr "Otobüs Yolu Düzenle"
@@ -14940,14 +14977,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr "Kullanılmayan Demiryolu"
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr "Kullanılmayan Demiryolu Düzenle"
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr "Terkedilmiş demiryolu düzenle"
@@ -14956,5 +14993,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr "hemzemin geçit"
@@ -14963,5 +15000,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr "geçit"
@@ -14971,5 +15008,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr ""
@@ -14977,5 +15014,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr "döner levha"
@@ -14984,10 +15021,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr "havayolu"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr "Teleski"
@@ -14995,10 +15032,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr "Teleski Düzenle"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr "Kayakçı Asansörü"
@@ -15006,10 +15043,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr "Kayakçı Asansörü Düzenle"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr "Hava tramvayı"
@@ -15017,10 +15054,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr "Hava tramvayı düzenle"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr ""
@@ -15028,5 +15065,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr ""
@@ -15034,5 +15071,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr "İstasyon"
@@ -15043,10 +15080,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr "İstasyon Düzenle"
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr "Yakıt"
@@ -15056,5 +15093,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr "Yakıt düzenle"
@@ -15070,5 +15107,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15078,5 +15115,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr "Park düzenle"
@@ -15084,41 +15121,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr "kapasite"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr "yüzey"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr "kat otoparkı"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr "yer altı"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr "park_ve_sür"
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr "Özürlü Alanı"
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr "Ücret"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr "Yıkama"
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr "Yıkama düzenle"
@@ -15126,5 +15163,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr "Alışveriş"
@@ -15132,15 +15169,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr "araçlı alışveriş düzenle"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr "tamirci"
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr "tamirci düzenle"
@@ -15148,5 +15185,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr "araç kiralam"
@@ -15155,10 +15192,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr "araç kiralam düzenle"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr "Paylaşım Alanı"
@@ -15166,5 +15203,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr "Araç Paylaşım alanı düzenle"
@@ -15172,5 +15209,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr "Bisiklet parkyeri düzenle"
@@ -15179,5 +15216,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr "bisiklet kiralama düzenle"
@@ -15186,15 +15223,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr "Bisiklet dükkanı düzenle"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "Toplu taşıma"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr "UIC-Referans"
@@ -15202,5 +15239,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr "Demiryolu sonu"
@@ -15208,5 +15245,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr "Son nokta düzenle"
@@ -15214,5 +15251,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr "Tramvay durağı"
@@ -15221,5 +15258,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr "tramvay durağı düzenle"
@@ -15227,5 +15264,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr "Demiryolu platformu"
@@ -15234,5 +15271,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr "Demiryolu platformu düzenle"
@@ -15244,5 +15281,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr "referans (iz numarası)"
@@ -15250,10 +15287,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr "Alan"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr "Metro Girişi"
@@ -15262,10 +15299,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr "Metro Girişi Düzenle"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr "tekerlekli sandalye"
@@ -15274,5 +15311,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr "otogar"
@@ -15281,5 +15318,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr "otogar düzenle"
@@ -15287,5 +15324,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr "otobüs durağı"
@@ -15295,5 +15332,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr "otobüs durağı düzenle"
@@ -15304,6 +15341,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr "Sığınak"
@@ -15311,10 +15348,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr "otobüs platformu"
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr "otobüs platformu düzenle"
@@ -15322,5 +15359,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr "Taksi"
@@ -15328,5 +15365,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr "taksi istasyonu düzenle"
@@ -15334,5 +15371,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr "Havaalanı"
@@ -15340,15 +15377,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr "ICAO"
@@ -15357,5 +15394,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr "Kalınacak Yerler"
@@ -15367,5 +15404,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -15374,15 +15411,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr "Hotel Düzenle"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr "Stars"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr "Motel"
@@ -15390,20 +15427,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr "Motel Düzenle"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr "Misafir Evi"
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr "Misafir Evi Düzenle"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr "kulübe"
@@ -15411,10 +15448,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr "külübe düzenle"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr "Hostel"
@@ -15422,30 +15459,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr "Hostel Düzenle"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr "Dağcı Barakası"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr "Dağcı Barakası Düzenle"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr "Karavan Alanı"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr "Karavan Alanı Düzenle"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr "Kamp Sitesi"
@@ -15453,10 +15490,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr "Kamp Sitesi Düzenle"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "Yüyecek+içecek"
@@ -15467,5 +15504,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -15473,5 +15510,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr "Restorant Düzenle"
@@ -15479,5 +15516,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr "lokanta"
@@ -15485,61 +15522,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr "italyan"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr "çinli"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr "yunan"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr "alman"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr "hint"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr "yöresel"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr "türk"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr "asyalı"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr "mexican"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr "japanese"
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -15547,9 +15584,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr "Fast Food düzenle"
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr "Kafe"
@@ -15557,10 +15594,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr "Cafe düzenle"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr "Pub"
@@ -15568,20 +15605,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr "Pub Düzenle"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr "Biergarten Düzenle"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr ""
@@ -15589,10 +15626,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr "GeceKlubu"
@@ -15600,20 +15637,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr "GeceKulubu Düzenle"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "Turizm"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr "İlginç Yerler"
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr "İlginç Yerler Düzenle"
@@ -15622,11 +15659,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr "Açılış saati"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "Müse"
@@ -15634,10 +15671,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr "Müze Düzenle"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "Hayvanat Bahçesi"
@@ -15646,10 +15683,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr "Hayvanat Bahçesi Düzenle"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr "Seyir Yeri"
@@ -15657,25 +15694,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr "Seyir Yeri Düzenle"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr "Seyir Kulesi"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr "Lunapark"
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr "Lunapark Düzenle"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr "Sanatsal"
@@ -15683,5 +15720,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr "Sanatsal Düzenle"
@@ -15689,5 +15726,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr ""
@@ -15695,80 +15732,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr ""
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "Harita"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr ""
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr "harita"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr "şehir haritası"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr "gezirehberi"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr "bisikletharitası"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
 msgid "Closer Description"
 msgstr ""
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1701
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Board Type"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "board"
 msgstr "yiyecek noktası"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "history"
 msgstr "tarih"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "nature"
 msgstr "doğa"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "wildlife"
 msgstr "vahşiyaşam"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Guidepost (Hiking)"
 msgstr ""
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr "Sığınak Düzenle"
@@ -15776,25 +15813,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr "Mangal Alanı"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr "Piknik Alanı"
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr "Piknik Alanı Düzenle"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "Tarihi Alanlar"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "Kale"
@@ -15803,20 +15840,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr "Kale Düzenle"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "Harabe"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr "Harabe Düzenle"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr "Arkeolojik Site"
@@ -15825,10 +15862,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr "Arkeolojik Site Düzenle"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr "Savaş Alanı"
@@ -15836,5 +15873,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr "Savaş Alanı Düzenle"
@@ -15842,15 +15879,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr "Anıt"
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr "Anıt Düzenle"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr "Abide"
@@ -15858,45 +15895,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr "Abide Düzenle"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr "Yol Kenar Geçişi"
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr "Yol Kenar Geçişi Düzenle"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr "Yolkenarı İbadetyeri"
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr "Yolkenarı İbadetyeri Düzenle"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "Dinlenme Alanı"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr "Su Parkı"
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr "Su Parkı Düzenle"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "Oyun Sahası"
@@ -15904,15 +15941,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr "Oyun Sahası Düzenle"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "Balıkçılık"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr "Balıkçılık Düzenle"
@@ -15920,15 +15957,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr "Spor Aktivite"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "Stadyum"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr "Stadyum Düzenle"
@@ -15942,6 +15979,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "Spor Seç"
@@ -15964,4 +16001,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -16022,5 +16067,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16030,5 +16083,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16174,5 +16227,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16278,5 +16331,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16317,29 +16370,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr "spor"
@@ -16349,227 +16403,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr "çoğul"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr "okçuluk"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr "atletik"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr "avustralya_footbol"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr "basebol"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr "basketbol"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr "bowling"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr "çimen bowling"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr "tırmanma"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr "cricket nets"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr "bisiklet"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr "köpek yarışı"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr "at binicilik"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr "futbol"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr "jimnastik"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr "hokey"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr "at_yarışı"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr "raket"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr "atıcılık"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr "kaykay"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr "paten"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr "kaymak"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "futbol"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr "yüzmek"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "masa_tenisi"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr "spor merkezi"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr "spor merkezi düzenle"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr "atıcılık"
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr "atıcılık düzenle"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr "yarış pisti"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr "yarış pisti düzenle"
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr "Golf Alanı"
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr "Golf Alanı Düzenle"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr "Minyatür Golf"
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr "Minyatür Golf Düzenle"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr "Spor"
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr "Çoğul"
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr "Çoğul Düzenle"
@@ -16608,191 +16662,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr "atıcılık"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr "spor_merkezi"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr "stadyum"
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr "10pin"
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr "10pin Düzenle"
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr "Atletik"
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr "Atletik Düzenle"
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr "okçuluk"
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr "okçuluk düzenle"
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr "tırmanma"
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr "tırmanma düzenle"
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr "Kano Düzenle"
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr "Bisiklet"
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr "Bisiklet Düzenle"
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr "Köpek Yarışı"
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr "Köpek Yarışı Düzenle"
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr "binicilik"
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr "binicilik düzenle"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr "At Yarışı"
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr "At Yarışı Düzenle"
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr "jimnastik"
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr "jimnastik düzenle"
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr "Motor Sporlar"
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr "Motor Sporları Düzenle"
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr "patinaj"
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr "patinaj düzenle"
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr "kaykay"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr "kaykay düzenle"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr "yüzme"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr "yüzme düzenle"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr "Kayak"
@@ -16800,56 +16854,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr "Kayak Düzenle"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr "Atıcılık"
@@ -16857,178 +16911,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr "Atıcılık Düzenle"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr "Spor (Topla)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr "Futbol"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr "Futbol Düzenle"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr "Amerikan Futbolu"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr "Amerikan Futbolu Düzenle"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr "Avustralyan Futbol"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr "Avustralyan Futbol Düzenle"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr "Baseball Düzenle"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr "Basketbol"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr "Basketbol Düzenle"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr "Golf Düzenle"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr "golf_alanı"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr "Boule Düzenle"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr "Bowling Düzenle"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr "Kricket"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr "Kricket Düzenle"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr "Cricket Nets Düzenle"
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr "Kroke"
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr "kroke Düzelt"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr "Hockey Düzenle"
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr "Pelota Düzenle"
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr "Raket"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr "Raket Düzenle"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr "Rugby Düzenle"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr "Masa Tenisi"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr "Masa Tenisi Düzenle"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr "Tennis Düzenle"
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "Binalar"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr "Bina"
@@ -17036,5 +17090,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "Kamu Binası"
@@ -17042,10 +17096,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr "Kamu Binası Düzenle"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "belediye binası"
@@ -17053,10 +17107,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "belediye binası düzenle"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "Büyükelçilik"
@@ -17064,10 +17118,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "Büyükelçilik Düzenle"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "adliye sarayı"
@@ -17076,10 +17130,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "adliye sarayı düzenle"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "Hapishane"
@@ -17088,10 +17142,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "Hapishane Düzenle"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "Polis"
@@ -17101,10 +17155,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "Polis Düzenle"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "İtfaye İstasyonu"
@@ -17113,10 +17167,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "İtfaye İstasyonu Düzenle"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "Postane"
@@ -17124,5 +17178,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr "Postane Düzenle"
@@ -17130,15 +17184,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr "Anaokul"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr "Anaokul Düzenle"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "Okul"
@@ -17146,10 +17200,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "okul düzenle"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr "Universite"
@@ -17157,10 +17211,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr "Universite Düzenle"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr "kolej"
@@ -17168,5 +17222,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr "kolej düzenle"
@@ -17174,5 +17228,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "Sinema"
@@ -17181,10 +17235,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "Sinema Düzenle"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "kütüphane"
@@ -17193,10 +17247,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "kütüphane düzenle"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr "sanat merkezi"
@@ -17204,10 +17258,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr "sanat merkezi düzenle"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "Tiyatro"
@@ -17216,10 +17270,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "Tiyatro Düzenle"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr "Tapınak"
@@ -17229,5 +17283,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr "Tapınak Düzenle"
@@ -17236,6 +17290,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr "Din"
@@ -17244,66 +17298,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr "budist"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr "hristiyan"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr "yahudi"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr "müslüman"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr "Zerdüştlük"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr "mezhep"
@@ -17312,81 +17366,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr "anglikan"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr "katholik"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr "protestan"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr "yahova_şahitleri"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr "Adres"
@@ -17395,5 +17449,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr "Adres Bilgileri Düzenle"
@@ -17401,5 +17455,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr "Ev no:"
@@ -17407,20 +17461,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr "Ev İsmi"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr "Şehir Adı"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "Posta Kodu"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr "Ülke Kodu"
@@ -17428,5 +17482,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr "Adres İnterpolasyon"
@@ -17435,5 +17489,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr "Adres İnterpolasyon Düzenle"
@@ -17441,71 +17495,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr "Numara şeması"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr "tek"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr "çift"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr "hepsi"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr "İnsan Yapımı"
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr "Tesis"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr "Tesis Düzenle"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "Kule"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "Kule Düzenle"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "Su Kulesi"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "Su Kulesi Düzenle"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr "Gazdeposu"
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr "Gazdeposu Düzenle"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "DenizFeneri"
@@ -17513,10 +17567,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "DenizFeneri Düzenle"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "Yeldeğerimeni"
@@ -17524,10 +17578,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "Yeldeğerimeni Düzenle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "Suboru Hattı"
@@ -17535,10 +17589,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "Suboru hattı Düzenle"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr "Kanalizasyon Plant"
@@ -17548,10 +17602,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr "Kanalizasyon Plant Düzenle"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr "Vinç"
@@ -17559,10 +17613,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr "Vinç Düzenle"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr "Fener"
@@ -17570,10 +17624,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr "Fener Düzenle"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr "Poligon Noktası"
@@ -17581,10 +17635,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr "Poligon Noktası Düzenle"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr "Gözetim"
@@ -17592,5 +17646,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr "Gözetim Kamera Düzenle"
@@ -17598,5 +17652,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr "Güç Jeneratorü"
@@ -17606,39 +17660,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr "Güç Jeneratorü Düzenle"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr "rüzgar"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr "hidro"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr "fosil"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr "nükleer"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr "kömür"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr "güneş enerjisi"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr "benzin"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr "Güç İstasyonu"
@@ -17647,10 +17701,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr "Güç İstasyonu Düzenle"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr "Alt Güç İstasyonu"
@@ -17659,5 +17713,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr "Alt Güç İstasyonu Düzenle"
@@ -17665,10 +17719,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr "çizgi referansı"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr "Güç Kulesi"
@@ -17679,5 +17733,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr "güç Kulesi Düzenle"
@@ -17685,5 +17739,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr "Güç Hattı"
@@ -17692,25 +17746,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr "Güç Hattı Düzenle"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr "Voltaj"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr "Kablo Miktarı"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr "hoş mekan"
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "Tuvalet"
@@ -17718,20 +17772,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr "Referans Numarası"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr "Not"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr "Posta Kutusu"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "Telefon"
@@ -17740,5 +17794,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr "Telefon Düzenle"
@@ -17746,5 +17800,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "Madeni Para"
@@ -17752,5 +17806,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr "Notlar"
@@ -17758,5 +17812,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronik cüzdan ve Para Değişim Kartları"
@@ -17764,5 +17818,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr "ATM kartı"
@@ -17770,15 +17824,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "Kredi Kartı"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "Telefon kart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr "Geri Dönüşüm"
@@ -17787,5 +17841,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr "Geri Dönüşüm İstasyonu"
@@ -17793,35 +17847,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr "Piller"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr "Çöp Tenekesi"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr "Kıyafet"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr "Cam"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr "Kağıt"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr "Hurda Metal"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr "banket"
@@ -17830,20 +17884,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr "Av Standı"
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr "Av Standı Düzenle"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr "Sakla"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr "Kilitle"
@@ -17851,22 +17905,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr "Yükseklik"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr "alçak"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr "yarım"
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr "tam"
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr "Kaynak"
@@ -17875,10 +17929,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr "Kaynak Düzenle"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "İçme Suyu"
@@ -17887,10 +17941,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "İçme Suyu Düzenle"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr "Bebek Yuvası"
@@ -17898,25 +17952,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr "Bebek Yuvası Düzenle"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "Dükkanlar"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr "Supermarket Düzenle"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr "Bakkal"
@@ -17924,10 +17978,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr "Bakkal Düzenle"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -17935,10 +17989,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr "Kiosk Düzenle"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "Kahve Makinası"
@@ -17946,5 +18000,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "Kahve Makinası Düzenle"
@@ -17952,88 +18006,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "Ücretli Ürünler"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr "toplu_taşıma_bileti"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr "toplu_taşıma_hatları"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr "Park_bileti"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr "yiyecek"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "içecek"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr "tatlı"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr "sigara"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr "fotoğraf"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr "hayvan_besini"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "gazeteler"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "oyuncuklar"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr "pullar"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "SIM-kart"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr "telefon_kartı"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr "bilet"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr "kondom"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr "tampon"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr "dışkı_poşeti"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr "hesap veya üyelik kartı"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "kasap"
@@ -18041,10 +18095,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "kasap düzenle"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "fırın"
@@ -18052,10 +18106,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "fırın düzenle"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr ""
@@ -18063,20 +18117,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr ""
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr ""
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr ""
@@ -18084,60 +18138,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr ""
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr ""
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr ""
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr ""
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr ""
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr ""
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr ""
@@ -18145,10 +18199,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr ""
@@ -18156,10 +18210,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr "kendin-al-market"
@@ -18167,60 +18221,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr "kendin-al-market düzenle"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr ""
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr "berber"
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr "berber düzenle"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr ""
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr ""
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "Kuru Temizleme"
@@ -18228,10 +18282,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "Kuru Temizleme Düzenle"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "Çamaşırhane"
@@ -18239,10 +18293,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "Çamaşırhane Düzenle"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr "Dışortam"
@@ -18250,35 +18304,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr "Dış ortam dükkanları düzenle"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr ""
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr ""
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "Kasa"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "Banka"
@@ -18286,5 +18340,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "Banka düzenle"
@@ -18292,10 +18346,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "ATM"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr "Döviz Bürosu"
@@ -18303,5 +18357,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr "Döviz Bürosu Düzenle"
@@ -18309,15 +18363,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "ATM Düzenle"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "Sağlık"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr "Doktor"
@@ -18325,20 +18379,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr "Doktor Düzenle"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr "Dişçi"
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr "Dişçi Düzenle"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "Eczane"
@@ -18346,5 +18400,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "Eczane Düzenle"
@@ -18352,10 +18406,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr "Dispenser"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "Hastane"
@@ -18363,10 +18417,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "Hastane Düzenle"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr "Acil Durum Noktası"
@@ -18375,5 +18429,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr "Acil Durum Noktası Düzenle"
@@ -18382,20 +18436,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr "Nokta Numarası"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr "Telefon Numarası"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Uluslararası kod kullanın, ör +90-212-67890)"
@@ -18403,5 +18457,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr "Veteriner"
@@ -18410,56 +18464,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr "Veteriner Düzenle"
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr "Kıta"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr "Kıta Düzenle"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr "Ülke"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr "Ülke Düzenle"
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr "İl"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr "İl Düzenle"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr "Bölge"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr "Bölge Düzenle"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr "vilayet"
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr "vilayet Düzenle"
@@ -18467,15 +18520,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr "Şehir"
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr "Şehir Düzenle"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr "Mahalle"
@@ -18483,10 +18536,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr "Mahalle Düzenle"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr "Banliyo"
@@ -18494,25 +18547,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr "Banliyo Düzenle"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "Köy"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "Köy Düzenle"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr "Mezra"
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr "Mezra Düzenle"
@@ -18520,5 +18573,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr "Semt"
@@ -18526,10 +18579,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr "Semt Düzenle"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "Ada"
@@ -18537,5 +18590,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "Ada Düzenle"
@@ -18543,5 +18596,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr "Mağara Girişi"
@@ -18549,10 +18602,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr "Mağara Girişi Düzenle"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "Zirve"
@@ -18560,10 +18613,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "Zirve Düzenle"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr "Buzul"
@@ -18571,10 +18624,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr "Buzul Düzenle"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr "Volkan"
@@ -18582,70 +18635,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr "Volkan Düzenle"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr "Belediye Sınırı"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr "Milli"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr "Ülke Sınırı Düzenle"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr "İdari"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr "İdari Sınırları Düzenle"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr "Sivil"
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr "Sivil Sınırları Düzenle"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr "Politik Sınır Düzenle"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr "Milli Park Sınırı Düzenle"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr "Arazi Kullanımı"
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "Ağaç"
@@ -18654,15 +18707,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "Ağaç Düzenle"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr "Botannik İsim"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr "Orman"
@@ -18671,5 +18724,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr "Orman Düzenle"
@@ -18677,17 +18730,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr "Kozalaklı Orman"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr "yaprak düken orman"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr "karışık"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "orman"
@@ -18696,14 +18749,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr "orman kullanımı düzenle"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr "korunacak doğa alanı"
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr "korunacak doğa alanı düzenle"
@@ -18711,25 +18764,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr "Taşlık Alan"
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr "Taşlık Alan Düzenle"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr "Çalılık"
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr "Çalılık Düzenle"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr "Dağ Eteği"
@@ -18737,10 +18790,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr "Dağ Eteği Kullanımı"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr "Sağlıksız Ağaç"
@@ -18748,5 +18801,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr "Sağlıksız Ağaç Düzenle"
@@ -18754,5 +18807,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr "Çiftlik"
@@ -18761,45 +18814,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr "Çiftlik Kullanımı Düzenle"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr "Çiftlik Arazisi"
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr "Çiftlik Arazisi Kullanımı Düzenle"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr "Bağ"
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr "Bağ Kullanımı Düzenle"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr "Kiralık Tarım Alanı"
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr "Kiralık Tarım Alanı Düzenle"
@@ -18807,25 +18860,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr "Bahçe"
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr "Bahçe Düzenle"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr "Otlak"
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr "Otlak Kullanım Düzenle"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr "Köy Yerleşimi"
@@ -18833,10 +18886,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr "Köy Yerleşimi Düzenle"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr "Genel"
@@ -18844,20 +18897,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr "Genel Düzenle"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr "Park Düzenle"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr "oyun alanı"
@@ -18865,5 +18918,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr "oyun alanı kullanımı düzenle"
@@ -18871,15 +18924,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr "Yerleşim Alanı"
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr "Yerleşim Alanı Kullanımı Düzenle"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr "Mezarlık"
@@ -18887,9 +18940,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr "Mezarlık Düzenle"
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr "Mezarlık"
@@ -18897,39 +18950,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr "Mezarlık Kullanımı Düzenle"
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr "Perakende"
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr "Perakende Alan Kullanımı Düzenle"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr "Ticari"
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr "Ticari Alan Kullanımı Düzenle"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr "Endüstriyel"
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr "Endüstriyel Alan Kullanımı Düzenle"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr "Demiryolu alanı"
@@ -18937,15 +18990,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr "Demiryolu alanı kullanımı düzenle"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr "Askeri"
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr "Askeri Alan Düzenle"
@@ -18953,55 +19006,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr "İnşaat Alanı"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr "İnşaat Alanı Düzenle"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr "Ağaçsız_Alan"
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr "Ağaçsız_Alan Kullanımı Düzenle"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr "Yeşil Alan"
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr "yeşil Alan kullanımı düzenle"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr "Toprak Dolum"
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr "Toprak Dolum Alanı Düzenle"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr "Taşocağı"
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr "taşocağı Düzenle"
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr ""
@@ -19011,5 +19064,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr ""
@@ -19018,10 +19071,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr ""
@@ -19029,5 +19082,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr ""
@@ -19036,5 +19089,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -19042,34 +19095,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr ""
@@ -19078,15 +19131,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr ""
@@ -19094,5 +19147,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr ""
@@ -19101,5 +19154,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr ""
@@ -19107,5 +19160,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr ""
@@ -19177,24 +19230,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr "bisiklet"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr "otobüs"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr ""
@@ -19247,20 +19300,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr "ayak"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr ""
@@ -19274,10 +19327,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr ""
@@ -19285,26 +19338,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr ""
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "Dönder"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr ""
@@ -19313,30 +19372,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr ""
@@ -19372,6 +19431,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19387,5 +19447,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19404,5 +19472,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr "standard"
@@ -19496,7 +19564,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr "köprü"
@@ -19761,15 +19829,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr "kırılmış"
@@ -19811,5 +19879,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr "at"
@@ -19947,4 +20015,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19956,5 +20030,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19962,5 +20036,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19997,5 +20071,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20019,11 +20093,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr ""
@@ -20047,5 +20121,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20086,5 +20160,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20122,6 +20196,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr "sokak"
@@ -20177,7 +20251,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr "araçyolu_hattı"
@@ -20230,11 +20304,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr "demiryolu"
@@ -20255,5 +20337,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr ""
@@ -20267,5 +20349,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr ""
@@ -20286,5 +20368,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr "turningcircle-döner kavşak"
@@ -20298,6 +20380,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr ""
@@ -20312,5 +20394,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr "riverbank"
@@ -20324,5 +20406,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr "akış"
@@ -20336,5 +20418,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr "iskele"
@@ -20362,5 +20444,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr "su_kemeri"
@@ -20503,5 +20585,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20528,13 +20610,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr "insan yapımı"
@@ -20596,7 +20678,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr "demiryolu_noktası"
@@ -20619,10 +20701,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr "başka_demiryolu"
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr "demiryolu_üzeri"
@@ -20658,7 +20740,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr "eski_demiryolu"
@@ -20703,6 +20785,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr "havayolu"
@@ -20716,5 +20798,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr "terminal"
@@ -20736,5 +20818,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr "havayolu_ağır"
@@ -20748,5 +20830,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr "hafif_hafif"
@@ -20754,4 +20836,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20794,7 +20883,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr "havayolu"
@@ -20811,5 +20900,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr "basit_meydan"
@@ -20824,5 +20913,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr "orta_meydan"
@@ -20837,5 +20926,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr "büyük_meydan"
@@ -20850,5 +20939,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr ""
@@ -20863,5 +20952,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr "acemiKullanıcı_meydanı"
@@ -20876,5 +20965,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr "acemiKullanıcı_meydanı"
@@ -20897,4 +20986,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -20905,4 +21001,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -20979,10 +21083,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr "güç"
@@ -20996,5 +21101,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr "iskele"
@@ -21008,5 +21113,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr "suhattı"
@@ -21134,12 +21239,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr "dinlenme_yeri"
@@ -21153,5 +21258,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr ""
@@ -21223,8 +21328,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr "dinlenme_yeri"
@@ -21326,10 +21431,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr "tail_trafiği"
@@ -21349,4 +21454,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21368,4 +21480,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21689,4 +21808,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -21713,24 +21840,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr "eski_sokak_lambası"
@@ -21762,6 +21897,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr "su_lambası"
@@ -21822,8 +21957,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr "sağlık"
@@ -22176,26 +22311,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr "alışveriş"
@@ -22250,5 +22385,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22267,8 +22402,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr "hotel"
@@ -22418,9 +22553,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr "turizm"
@@ -22492,8 +22627,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr "tarihi"
@@ -22564,8 +22699,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr "yeşil"
@@ -22579,5 +22714,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr "taş_ocağı"
@@ -22591,5 +22726,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr "toprak_doldurma"
@@ -22611,5 +22746,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr "havza"
@@ -22623,5 +22758,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr "orman"
@@ -22635,5 +22770,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr "çiftlik"
@@ -22656,5 +22791,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr "perakende"
@@ -22668,5 +22803,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr "endüstri"
@@ -22680,5 +22815,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr "ağaçsız_alan"
@@ -22692,5 +22827,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr "yeşil_alan"
@@ -22704,5 +22839,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr "demiryolu"
@@ -22759,7 +22894,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr "askeri"
@@ -22773,5 +22908,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr "mezarlık"
@@ -22784,5 +22919,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr "zirve"
@@ -22797,5 +22932,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr "buzul"
@@ -22809,5 +22944,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr "volkanik"
@@ -22862,8 +22997,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr "doğal"
@@ -22877,5 +23012,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr "çalılık"
@@ -22889,5 +23024,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr "çalılık"
@@ -22901,5 +23036,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr "orman"
@@ -22913,5 +23048,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr "çamur"
@@ -22925,5 +23060,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr "sahil"
@@ -23001,8 +23136,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr "rut"
@@ -23050,7 +23185,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr "sınırlar"
@@ -23192,10 +23327,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr "yer"
@@ -23243,6 +23378,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr "adres"
@@ -23539,13 +23674,4 @@
 msgstr ""
 
-#~ msgid "Unknown file extension."
-#~ msgstr "Bilinmeyen dosya uzantısı."
-
-#~ msgid "Move"
-#~ msgstr "Taşı"
-
-#~ msgid "end"
-#~ msgstr "bitiş"
-
 #~ msgid ""
 #~ "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -23705,6 +23831,6 @@
 #~ "Eklenti {0} göründüğü kadarıyla linki bozuk veya otomatik indirilemiyor ."
 
-#~ msgid "Rotate"
-#~ msgstr "Dönder"
+#~ msgid "Move"
+#~ msgstr "Taşı"
 
 #~ msgid "Change"
@@ -23751,4 +23877,7 @@
 #~ msgstr "bazı kavşaklar zaten hizada"
 
+#~ msgid "Unknown file extension."
+#~ msgstr "Bilinmeyen dosya uzantısı."
+
 #~ msgid "Data Layer"
 #~ msgstr "Bilgi Tabakası"
@@ -23778,4 +23907,7 @@
 #~ msgid "Validate either current selection or complete dataset."
 #~ msgstr "Aktif seçimi veya bütün veriyi onayla."
+
+#~ msgid "end"
+#~ msgstr "bitiş"
 
 #~ msgid "image not loaded"
Index: /applications/editors/josm/i18n/po/zh_TW.po
===================================================================
--- /applications/editors/josm/i18n/po/zh_TW.po	(revision 17068)
+++ /applications/editors/josm/i18n/po/zh_TW.po	(revision 17069)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
-"PO-Revision-Date: 2009-08-04 11:03+0000\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
+"PO-Revision-Date: 2009-08-10 13:38+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: 2009-08-10 11:58+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: zh_TW\n"
@@ -57,6 +57,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -66,5 +66,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -101,6 +101,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "錯誤"
@@ -111,5 +111,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "未儲存的變更"
@@ -129,10 +129,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -149,15 +149,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -187,6 +187,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -216,5 +216,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -370,5 +370,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
 msgstr ""
@@ -452,9 +452,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -487,7 +487,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -568,37 +568,37 @@
 msgstr "路徑 {1} 中的 {0} 個節點超過最大值。允許的節點數為 {2} 個"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "資料"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "圖層"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "選取"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "衝突"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "下載"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "縮放至 {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "將檢視縮放至 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -608,30 +608,30 @@
 msgstr "檢視：{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "沒有選擇要縮放的物件。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "沒有要縮放的衝突"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "合併路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "合併多個路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "請選擇至少兩個以上的路徑來合併"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr "是否組合有不同關係成員的路徑？"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -639,13 +639,13 @@
 msgstr "選取的路徑有不同的關係成員。是否仍要將它們組合？"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "合併，不管怎樣"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "改變路徑方向?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -653,10 +653,10 @@
 msgstr "以這些路徑目前的方向是不能組合的。是否要將它們中的一部分反轉？"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "反轉後組合"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -664,20 +664,20 @@
 msgstr "輸入所有衝突項目的數值。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "解決衝突"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "組合 {0} 條路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "所有的路徑都是空的"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -722,6 +722,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -743,6 +743,6 @@
 msgstr "刪除選擇的物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -752,5 +752,5 @@
 msgstr "覆寫"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -882,7 +882,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "匯出資料到 GPX 檔案"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -898,5 +897,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -914,5 +913,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -986,22 +985,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "合併節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "將節點合併到最舊的一個中。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "請至少選取兩個節點來合併"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr "是否合併有不同成員的節點？"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1009,13 +1008,13 @@
 msgstr "選取的節點有不同的關係成員。是否仍要合併它們？"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "強制合併"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "不能合併節點。會刪除仍在使用的路徑。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1269,7 +1268,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "找不到交叉點。沒有東西變更。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1849,5 +1847,5 @@
 msgstr "下載時發生錯誤"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1859,5 +1857,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr ""
@@ -1896,11 +1894,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2038,5 +2036,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2110,5 +2108,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "搜尋物件。"
@@ -2236,5 +2234,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "搜尋"
@@ -2436,5 +2434,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2477,5 +2475,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr "自關係中刪除"
@@ -2516,8 +2514,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "合併 {0} 個節點"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2553,8 +2552,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "{0} 節點"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2718,7 +2718,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "變更組合"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2728,5 +2728,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2771,5 +2771,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2801,5 +2801,5 @@
 msgstr "參數「{0}」不是可接受的類別，取得「{1}」"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2812,5 +2812,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "鐵路"
@@ -2825,5 +2825,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3106,5 +3106,5 @@
 msgstr "不再顯示"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3115,5 +3115,5 @@
 "請檢查您的偏好設定中的伺服器 URL 和網際網路連線。"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3123,10 +3123,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3134,25 +3134,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "不明"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3162,9 +3162,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3173,9 +3173,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "未預期的例外"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3185,9 +3197,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3197,5 +3209,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr ""
@@ -3283,10 +3295,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "使用者名稱"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "密碼"
@@ -3490,15 +3502,15 @@
 msgstr "(沒有物件)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "圖層不在清單中。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3552,5 +3564,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr "我的與他們的"
@@ -3559,5 +3571,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr "我的與合併的"
@@ -3566,20 +3578,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr "他們的與合併的"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr "角色 {0} 沒有參與比較配對 {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr "屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3589,6 +3601,6 @@
 msgstr "標籤"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3596,6 +3608,6 @@
 msgstr "節點"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3603,40 +3615,40 @@
 msgstr "成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr "沒有待解決的標籤衝突"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "標籤({0} 衝突)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr "{0} 個標籤衝突待解決"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr "節點(已解決)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr "合併的節點清單已凍結。這個路徑的節點清單中沒有待解決的衝突"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "節點(有衝突)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr "這個路徑的節點清單中待解決的衝突"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "成員(已解決)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3644,74 +3656,74 @@
 msgstr "合併的節點清單已凍結。這個關係的成員清單中沒有待解決的衝突"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "成員(有衝突)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr "這個關係的成員清單中待解決的衝突"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr "沒有待解決的衝突"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "屬性(有衝突)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr "待解決的屬性衝突"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr "衝突的決議"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr "參數目前超出範圍：得到 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr "角色 {0} 中的清單目前沒有參與比較配對"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr "參數「index」有未預期的數值。得到 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr "在清單中找不到項目 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr "鎖定捲動"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr "比較 "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr "我的版本"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr "我的資料組合裡元件的清單，例如本地端資料組合"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr "合併的版本"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3719,30 +3731,30 @@
 msgstr "合併元件的清單。它們會在合併決定被接受時取代我的元件。"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr "他們的版本"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr "他們的資料組合裡元件的清單，例如伺服器資料組合"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr "> 頂端"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr "將我選取的節點複製到合併節點清單的開頭"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr "> 底部"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr "將我選取的元件複製到合併元件清單的結尾"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3750,5 +3762,5 @@
 msgstr "將我選取的元件複製到合併元件清單的第一個選取元件之前"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3756,13 +3768,13 @@
 msgstr "將我選取的元件複製到合併元件清單的第一個選取元件之後"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr "將他們選取的元件複製到合併元件清單的開頭"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr "將他們選取的元件複製到合併元件清單的結尾"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3770,5 +3782,5 @@
 msgstr "將他們選取的元件複製到合併元件清單的第一個選取元件之前"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3776,21 +3788,21 @@
 msgstr "將他們選取的元件複製到合併元件清單的第一個選取元件之後"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr "上"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr "將選取的元件向上移動一個位置"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr "下"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr "將選取的項目向下移動一個位置"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3799,27 +3811,27 @@
 msgstr "移除"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr "從合併元件的清單移除選取的項目"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr "凍結"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr "凍結合併元件目前的清單"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr "解除凍結"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr "將合併元件的清單解除凍結並開始合併"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3827,5 +3839,5 @@
 msgstr "<html>點選 <strong>{0}</strong> 開始合併我和他們的項目</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3834,5 +3846,5 @@
 msgstr "<html>點選 <strong>{0}</strong> 結束合併我和他們的項目</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3840,5 +3852,5 @@
 msgstr[0] "我的版本 ({0} 個項目)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3846,5 +3858,5 @@
 msgstr[0] "合併的版本 ({0} 個項目)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -3852,21 +3864,21 @@
 msgstr[0] "他們的版本 ({0} 個項目)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -3876,5 +3888,5 @@
 msgstr "參數「{0}」不能為空值(null)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -3884,5 +3896,5 @@
 msgstr "可調整的 {0} 尚未註冊。不能設定在同步調整中的參與"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -3890,19 +3902,19 @@
 msgstr "可調整的 {0} 尚未註冊"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr "節點"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr "合併的節點尚未凍結。不能建置決議指令"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr "未預期的欄位索引。得到 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -3911,19 +3923,19 @@
 msgstr "<html>與伺服器溝通時發生錯誤<br>詳細資料：{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr "與伺服器溝通失敗"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr "是的，也取消它們的刪除"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr "不，取消操作"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -3934,9 +3946,9 @@
 "<br><br>是否要一併取消這些節點的刪除？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr "取消刪除額外的節點？"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -3946,13 +3958,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr "我的資料組合的屬性，例如本地端資料組合"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -3960,90 +3972,90 @@
 msgstr "合併元件的屬性。當合併的決定被接受時它們會取代我的元件中的屬性。"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr "他們的資料組合的屬性，例如伺服器資料組合"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr "坐標："
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr "刪除的狀態："
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr "可視狀態："
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr "（沒有）"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "已刪除"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr "未刪除"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr "可視的（在伺服器上）"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr "不可視（在伺服器上）"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr "保留本地端版本的複本"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr "實際從本地端資料組合中刪除"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr "保留我的坐標"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr "保留他們的坐標"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr "在不同的坐標之間未解決的衝突"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr "保留我的刪除狀態"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr "保留他們的刪除狀態"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr "已刪除狀態之間未解決的衝突"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr "保留我的可見性狀態"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr "是，重設 id"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr "否，中止"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4055,17 +4067,17 @@
 "上傳時伺服器會重新分配<br>新的 id 給它。<br>您是否同意？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr "重設 id 為 0"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr "保留他們的可見性"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr "是，清除它"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4074,14 +4086,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr "從資料組合移除"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4089,21 +4101,21 @@
 msgstr "角色"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr "合併的節點尚未凍結。不能建置決議指令"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4111,14 +4123,14 @@
 msgstr "<未定義的>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr "合併的資料組合將不會包含設定鍵 {0} 的標籤"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4126,7 +4138,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4138,7 +4150,7 @@
 msgstr "設定鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4151,45 +4163,45 @@
 msgstr "數值"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr "不能接受未決定的標籤合併項目"
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr "參數「col」必須為 0 或 1。卻得到 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr "我的版本（本地端資料組合）"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr "他們的版本（伺服器資料組合）"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ">"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr "保留本地端資料組合中選取的設定鍵/數值配對"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr "保留伺服器資料組合中選取的設定鍵/數值配對"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr "未決定"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr "將選取的標籤標記為未決定"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4209,8 +4221,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4247,5 +4259,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4347,83 +4359,83 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "開啟所有載入圖層的清單。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "刪除選取的圖層。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr "刪除圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "顯示/隱藏"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "切換選取的圖層可見性狀態。"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "將選取的圖層上移一列。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "將選取的圖層下移一列。"
@@ -4433,6 +4445,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4440,22 +4452,22 @@
 msgstr[0] "這會改變 {0} 個物件。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "空白的數值會刪除該設定鍵。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<不同>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "是否改變數值？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4463,5 +4475,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4469,40 +4481,40 @@
 msgstr[0] "改變屬性至 {0} 個物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "請選擇一個設定鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "請選擇一個數值"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 msgid "Please select the objects you want to change properties for."
 msgstr "請選擇您要改變屬性的物件。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr "屬性/成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "選取物件的屬性。"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "加入屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4519,39 +4531,39 @@
 msgstr "加入"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 msgid "Add a new key/value pair to all objects"
 msgstr "將新的設定鍵/數值配對加入到所有的物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "編輯屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 msgid "Edit the value of the selected key for all objects"
 msgstr "編輯所有物件選取設定鍵的數值"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "屬性：{0} / 成員：{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr "屬性 / 成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "改變關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "確定要刪除關係 {0} 的選擇區域？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "刪除所有物件中選取的設定鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "删除屬性"
@@ -4563,5 +4575,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "關係"
@@ -4593,31 +4605,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "目前的選擇區域"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "開啓選擇區域清單視窗。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "縮放至選取的元件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "重新整理選擇區域清單。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "縮放至選擇區域"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Sel.: Rel.:{0} / 路徑:{1} / 節點:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4625,5 +4637,5 @@
 msgstr "選擇區域"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4631,5 +4643,5 @@
 msgstr[0] "{0} 路徑"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4637,5 +4649,5 @@
 msgstr[0] "{0} 關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -4845,7 +4857,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "刪除選取的關係"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -4928,5 +4939,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5164,5 +5175,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "地名"
@@ -5209,21 +5220,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "類型"
@@ -6023,72 +6034,508 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "名稱"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+"<html>版本 <strong>{0}</strong> 由 <strong>{2}</strong> 建立於 <strong>{1}</"
+"strong> </html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr "版本 {0} 由 {2} 建立於 {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr "版本"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr "{0} 的圖片"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr "讀取 GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "點 {0} x {1} 沒有時刻"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "不能讀取點 {1} x {2} 的時刻「{0}」"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr "找不到具可讀時刻戳記的圖片。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "正在讀取 {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr "有 Geotag 的圖片"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr "GPS 開始：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr "GPS 結束：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr "目前的差分： {0}秒"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr "時區差異： "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "圖片"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} 在此軌跡中。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "同步時鐘"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "JPEG 圖片 (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "檔案「{0}」的日期無法解析。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "在檔案「{0}」中沒有 EXIF 時刻。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "圖片"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "輸入要顯示的日期 (mm/dd/yyyy HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr "GPS 單元時區 (不同於照片)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr "與 GPS 單元同步時刻"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr "輸入的時刻無法解析。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr "gps 點"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "自訂線條的繪製"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr "使用全域設定值。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr "在這個圖層的各點之間繪出線條。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr "在這個圖層的各點之間不要繪出線條。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr "選擇線條繪製選項"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "自訂顏色"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "預設值"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "選擇一種顏色"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr "已命名點的標記"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "{0} 的已命名軌跡點"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "匯入音效"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr "Wave 音效檔案 (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "{0} 的音效標記"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "匯入圖片"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} 軌跡， "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} 路線， "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} 航點"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr "名稱：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr "描述：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr "長度： "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "轉換為資料圖層"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+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>如果您想要上傳"
+"軌跡，請看這裡："
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr "轉換自：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr "從 OSM 沿這條軌跡下載"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr "下載這裡面的每個物件："
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr "{0} 公尺"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr "每個要求最大區域："
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} 平方公里"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>這個動作會發出 {0} 個<br>個別的下載要求。您是否希望<br>繼續？</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr "在圖層中沒有可用的 GPX 軌跡可供音效關聯。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr "部分航點的時刻戳記早於軌跡起點或晚於終點會被忽略或是移至起點。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr "部分航點離軌跡太遠而無法明顯判斷其時刻者會被忽略。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr "資料圖層 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr "超出下載的區域"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr "版本 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr "警告：混合 0.6 和 0.5 資料會成為 0.5 版"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} 組成："
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} 已刪除。)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr "取消設定"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr "API 版本： {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr "轉換為 GPX 圖層"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6097,7 +6544,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6107,441 +6554,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "名稱"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-"<html>版本 <strong>{0}</strong> 由 <strong>{2}</strong> 建立於 <strong>{1}</"
-"strong> </html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr "版本 {0} 由 {2} 建立於 {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr "版本"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr "{0} 的圖片"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr "讀取 GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "點 {0} x {1} 沒有時刻"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "不能讀取點 {1} x {2} 的時刻「{0}」"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr "找不到具可讀時刻戳記的圖片。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "正在讀取 {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr "有 Geotag 的圖片"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr "GPS 開始：{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr "GPS 結束：{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr "目前的差分： {0}秒"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr "時區差異： "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "圖片"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} 在此軌跡中。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "同步時鐘"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "JPEG 圖片 (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "檔案「{0}」的日期無法解析。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "在檔案「{0}」中沒有 EXIF 時刻。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "圖片"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "輸入要顯示的日期 (mm/dd/yyyy HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr "GPS 單元時區 (不同於照片)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr "與 GPS 單元同步時刻"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr "輸入的時刻無法解析。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr "gps 點"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "自訂線條的繪製"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "使用全域設定值。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr "在這個圖層的各點之間繪出線條。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr "在這個圖層的各點之間不要繪出線條。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr "選擇線條繪製選項"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "自訂顏色"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "預設值"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "選擇一種顏色"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr "已命名點的標記"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr "{0} 的已命名軌跡點"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "匯入音效"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr "Wave 音效檔案 (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "{0} 的音效標記"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "匯入圖片"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} 軌跡， "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} 路線， "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} 航點"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr "名稱：{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr "描述：{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr "長度： "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "轉換為資料圖層"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-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>如果您想要上傳"
-"軌跡，請看這裡："
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr "轉換自：{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr "從 OSM 沿這條軌跡下載"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr "下載這裡面的每個物件："
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr "{0} 公尺"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr "每個要求最大區域："
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} 平方公里"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>這個動作會發出 {0} 個<br>個別的下載要求。您是否希望<br>繼續？</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr "在圖層中沒有可用的 GPX 軌跡可供音效關聯。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr "部分航點的時刻戳記早於軌跡起點或晚於終點會被忽略或是移至起點。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr "部分航點離軌跡太遠而無法明顯判斷其時刻者會被忽略。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr "資料圖層 {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr "超出下載的區域"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr "版本 {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr "警告：混合 0.6 和 0.5 資料會成為 0.5 版"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} 組成："
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} 已刪除。)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr "取消設定"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr "API 版本： {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr "轉換為 GPX 圖層"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -6904,5 +6915,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "汽車"
@@ -6919,16 +6930,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "單車"
@@ -6956,14 +6969,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "步行"
@@ -7171,19 +7187,19 @@
 msgstr "語言"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr "啟用內建預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr ""
@@ -7312,37 +7328,11 @@
 msgstr "代理伺服器密碼"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr "OSM 伺服器 (REST API) 的基礎 URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr "OSM 帳號的登入名稱 (e-mail)。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr "OSM 帳號的登入密碼。留空則不會儲存任何密碼。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "基礎伺服器 URL"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr "OSM 使用者名稱 (e-mail)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "OSM 密碼"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
-"<html>警告：此密碼是以純文字的方式儲存於偏好設定檔案中。<br>密碼也是在 URL 中"
-"以純文字的方式傳送到伺服器。<br><b>請勿使用重要的密碼。</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -7699,7 +7689,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "不能讀取 \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -7802,7 +7792,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "不明的角色「{0}」。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -7960,23 +7950,49 @@
 msgstr "無效的 bz2 檔案。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "不正確的密碼或使用者名稱。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "警告：密碼是以未加密的方式傳輸。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "儲存使用者與密碼(未加密)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "輸入密碼"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
 msgstr "登入"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr "OSM 帳號的登入名稱 (e-mail)。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr "OSM 帳號的登入密碼。留空則不會儲存任何密碼。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr "OSM 使用者名稱 (e-mail)"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "OSM 密碼"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
+"<html>警告：此密碼是以純文字的方式儲存於偏好設定檔案中。<br>密碼也是在 URL 中"
+"以純文字的方式傳送到伺服器。<br><b>請勿使用重要的密碼。</b></html>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -7986,7 +8002,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
-#, fuzzy, java-format
+#, java-format
 msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-msgstr "預期為 OsmDataLayer 或 GpxLayer 的實體。卻取得「{0}」。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -8139,14 +8155,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "「{0}」的不明成員類型。"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "準備 OSM 資料..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr ""
@@ -8588,5 +8604,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr "描述"
@@ -8999,5 +9015,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr "載入檔案有錯誤"
@@ -9239,5 +9255,4 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
-#, fuzzy
 msgid ""
 "To enable the cadastre WMS plugin, change\n"
@@ -9245,6 +9260,4 @@
 "projection and retry"
 msgstr ""
-"要啓用 cadastre WMS 外掛程式，請將\n"
-"JOSM 投影改為蘭勃特投影後重新啟動"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9335,5 +9348,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -9875,7 +9888,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr "水域"
@@ -10052,7 +10065,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "名稱"
+msgstr ""
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10610,12 +10622,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "開始"
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0} 節點"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -10752,5 +10764,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr "街道名稱"
@@ -11567,7 +11579,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr "建築"
@@ -11581,5 +11593,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr "區域"
@@ -11832,12 +11844,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "請選擇要編輯的列。"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "儲存 WMS 圖層"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
@@ -11850,7 +11860,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "沒有要上傳的變更。"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -11863,61 +11872,61 @@
 "這可能會導致錯誤的坐標。"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr "自動下載"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS 圖層 ({0})，於縮放 {1} 自動下載"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS 圖層 ({0})，於縮放 {1} 下載"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr "要求的區域太大。請拉近一點，或是改變解析度"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr "下載可見的拼貼"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr "改變解析度"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr "重新載入錯誤的拼貼"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr "透明色版"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr "將 WMS 圖層儲存為檔案"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr "儲存 WMS 圖層"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr "從檔案載入 WMS 圖層"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr "載入 WMS 圖層"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "不支援的 WMS 檔案版本；發現 {0}，應為 {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr "檔案格式錯誤"
@@ -12267,4 +12276,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12301,5 +12312,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr "街道"
@@ -12310,5 +12321,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "高速公路(Motorway)"
@@ -12317,5 +12328,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr "編輯高速公路"
@@ -12342,8 +12353,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr "道路編號"
@@ -12384,21 +12395,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr "層級"
@@ -12412,8 +12423,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr "車道數"
@@ -12431,15 +12442,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr "最高限速 (km/h)"
@@ -12476,16 +12487,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr "單行道"
@@ -12527,19 +12538,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "橋"
@@ -12575,19 +12586,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr "隧道"
@@ -12621,18 +12632,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr "斷開"
@@ -12666,18 +12677,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr "堤防"
@@ -12685,5 +12696,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr "高速公路連絡道路"
@@ -12692,5 +12703,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr "編輯高速公路連絡道路"
@@ -12698,5 +12709,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr "快速道路(Trunk)"
@@ -12705,5 +12716,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr "編輯快速道路"
@@ -12713,6 +12724,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr "汽車專用"
@@ -12720,5 +12731,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr "快速道路連絡道路"
@@ -12727,5 +12738,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr "編輯快速道路連絡道路"
@@ -12738,5 +12749,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "省道(Primary)"
@@ -12745,5 +12756,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr "編輯省道"
@@ -12751,10 +12762,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr "省道連絡道路"
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr "編輯省道連絡道路"
@@ -12766,5 +12777,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "縣道(Secondary)"
@@ -12774,5 +12785,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr "編輯縣道"
@@ -12780,5 +12791,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr "鄉道(Tertiary)"
@@ -12788,5 +12799,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr "編輯鄉道"
@@ -12798,5 +12809,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "未分類(Unclassified)"
@@ -12806,5 +12817,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr "編輯未分類的道路"
@@ -12831,19 +12842,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr "寬度 (米)"
@@ -12855,5 +12866,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "居住的(Residential)"
@@ -12862,5 +12873,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr "編輯居住的街道"
@@ -12884,13 +12895,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr "路面"
@@ -12910,20 +12921,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr "有鋪面的"
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr "沒鋪面的"
@@ -12931,12 +12942,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr "石子路"
@@ -12944,5 +12955,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr "生活街道"
@@ -12951,5 +12962,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr "編輯生活街道"
@@ -12957,5 +12968,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr "巷/弄(Service)"
@@ -12964,5 +12975,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr "編輯巷/弄"
@@ -12972,18 +12983,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr "巷/弄道路類型"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr "巷/弄"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr "車道"
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr "停車場通道"
@@ -12991,5 +13002,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr "停車場通道"
@@ -12999,5 +13010,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr "編輯停車場通道"
@@ -13005,5 +13016,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr "道路（不明的類型）"
@@ -13012,5 +13023,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr "編輯不明類型的道路"
@@ -13019,20 +13030,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr "道路限制"
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr "編輯道路限制"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr "通行費"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr "沒有出口（死路）"
@@ -13045,8 +13056,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr ""
@@ -13090,23 +13101,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr "是"
@@ -13119,40 +13130,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr "私人的"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr "已指定"
@@ -13165,19 +13176,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr "目的地"
@@ -13200,65 +13211,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr "農業的"
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr "否"
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr "貨物"
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "大型車 (hgv)"
@@ -13273,10 +13284,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr "馬"
@@ -13292,13 +13303,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr "機車"
@@ -13314,30 +13325,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr "汽車"
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr "公共汽車 (psv)"
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr "動力小船"
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr "小船"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr "最低限速 (km/h)"
@@ -13345,25 +13356,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr "總重限制（噸）"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr "高度限制（米）"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr "寬度限制（米）"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr "長度限制（米）"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr "圓環"
@@ -13374,5 +13385,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr "編輯交叉點"
@@ -13394,9 +13405,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr "類型"
@@ -13416,10 +13427,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr "高速公路"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr "高速公路連絡道路"
@@ -13441,10 +13452,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr "快速道路"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr "快速道路連絡道路"
@@ -13466,10 +13477,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr "省道"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr "省道連絡道路"
@@ -13491,6 +13502,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr "縣道"
@@ -13504,9 +13515,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr "鄉道"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr "未分類的"
@@ -13520,9 +13531,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr "居住的"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr "生活街道"
@@ -13552,10 +13563,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr "巷/弄"
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr "公車專用道"
@@ -13563,4 +13574,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13578,6 +13596,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr "施工"
@@ -13588,10 +13606,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr "編輯橋樑"
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr "編輯隧道"
@@ -13599,19 +13617,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr "路徑"
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr "施工"
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr "編輯施工中的公路"
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr "交叉點"
@@ -13627,5 +13645,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr "圓環"
@@ -13634,5 +13652,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr "馬道"
@@ -13640,5 +13658,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr "編輯馬道"
@@ -13646,5 +13664,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr "自行車道"
@@ -13654,5 +13672,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr "編輯自行車道"
@@ -13660,5 +13678,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr "人行步道"
@@ -13667,5 +13685,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr "編輯人行步道"
@@ -13673,5 +13691,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr "徒步區"
@@ -13680,5 +13698,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr "編輯徒步區街道"
@@ -13686,5 +13704,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr "階梯"
@@ -13694,5 +13712,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr "編輯階梯"
@@ -13701,5 +13719,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr "產業道路"
@@ -13708,14 +13726,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr "編輯產業道路"
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr "水泥地"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr "碎石路"
@@ -13723,18 +13741,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr "地面"
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr "草地"
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr "沙地"
@@ -13742,5 +13760,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr "產業道路等級 1"
@@ -13749,5 +13767,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr "編輯產業道路等級 1"
@@ -13755,5 +13773,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr "產業道路等級 2"
@@ -13762,5 +13780,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr "編輯產業道路等級 2"
@@ -13768,5 +13786,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr "產業道路等級 3"
@@ -13775,5 +13793,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr "編輯產業道路等級 3"
@@ -13781,5 +13799,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr "產業道路等級 4"
@@ -13788,5 +13806,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr "編輯產業道路等級 4"
@@ -13794,5 +13812,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr "產業道路等級 5"
@@ -13801,5 +13819,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr "編輯產業道路等級 5"
@@ -13808,5 +13826,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr "路徑"
@@ -13815,13 +13833,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr "編輯小徑"
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr "雪上摩托車"
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr "滑雪"
@@ -13829,5 +13847,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr "健走"
@@ -13837,5 +13855,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr "編輯健走"
@@ -13843,5 +13861,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr "登山"
@@ -13851,5 +13869,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr "編輯登山健行"
@@ -13857,5 +13875,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr "較難的登山健行"
@@ -13865,5 +13883,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr "編輯較難的登山健行"
@@ -13871,5 +13889,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr "高山健行"
@@ -13879,5 +13897,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr "編輯高山健行"
@@ -13885,5 +13903,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr "較難的高山健行"
@@ -13893,5 +13911,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr "編輯較難的高山健行"
@@ -13899,5 +13917,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr "艱難的高山健行"
@@ -13907,5 +13925,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr "編輯艱難的高山健行"
@@ -13913,10 +13931,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr "路標"
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr "高速公路交流道"
@@ -13924,15 +13942,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr "編輯高速公路交流道"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr "編號"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr "休息站"
@@ -13940,5 +13958,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr "編輯休息站"
@@ -13973,14 +13991,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr "經營者"
@@ -13989,5 +14007,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr "交通號誌"
@@ -13997,5 +14015,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr "行人穿越道類型"
@@ -14004,27 +14022,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr "沒有號誌"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr "交通號誌"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr "安全島"
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr "未畫標記"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr ""
@@ -14032,6 +14050,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr "以自行車穿越"
@@ -14040,11 +14058,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr "有人陪同穿越"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr "行人穿越道類型名稱 (英國)"
@@ -14052,30 +14070,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr "斑馬線"
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr "禁止通行"
@@ -14083,5 +14101,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr "行人穿越道"
@@ -14090,14 +14108,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr "編輯行人穿越道"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr "類型名稱 (英國)"
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr "小型圓環"
@@ -14108,14 +14126,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr "方向"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr "順時針"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr ""
@@ -14125,20 +14143,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr "城市邊界"
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr "編輯城市邊界標誌"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr "第二名稱"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr "測速照相"
@@ -14146,5 +14164,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr "緊急電話"
@@ -14152,5 +14170,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr "坡"
@@ -14158,5 +14176,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr "險升/降坡"
@@ -14165,10 +14183,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr "淺灘"
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr "編輯淺灘"
@@ -14176,5 +14194,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr "鞍部"
@@ -14182,5 +14200,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr "編輯鞍部"
@@ -14192,7 +14210,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr "海拔"
@@ -14200,5 +14218,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr "障礙物"
@@ -14206,5 +14224,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr "車阻柱"
@@ -14212,5 +14230,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr "編輯車阻柱"
@@ -14249,18 +14267,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr "允許通行方向："
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr "自行車護欄"
@@ -14269,5 +14291,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr "水泥護欄"
@@ -14275,5 +14297,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr "家畜柵欄"
@@ -14281,10 +14303,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr "編輯家畜柵欄"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr "公車專用道障礙"
@@ -14292,15 +14314,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr "長釘"
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr "編輯長釘"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr "收費站"
@@ -14308,5 +14330,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr "編輯收費站"
@@ -14314,10 +14336,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr "國境管控站"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr "編輯國境管控站"
@@ -14327,5 +14349,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr "籬笆"
@@ -14334,5 +14356,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr "欄柵"
@@ -14341,5 +14363,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr "牆"
@@ -14347,5 +14369,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr "城牆"
@@ -14354,5 +14376,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr "擋土牆"
@@ -14364,15 +14386,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr "入口"
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr "編輯入口"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr "閘門"
@@ -14380,50 +14402,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr "編輯閘門"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr ""
@@ -14431,15 +14453,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+#, fuzzy
+msgid "Turnstile"
+msgstr "調車轉盤"
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "編輯隧道"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr "城門"
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr "編輯城門"
@@ -14450,10 +14484,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr "水域"
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr "泉"
@@ -14461,5 +14495,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr "編輯泉"
@@ -14467,5 +14501,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr ""
@@ -14473,10 +14507,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr "溪流"
@@ -14484,10 +14518,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr "編輯溪流"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr "運河"
@@ -14495,10 +14529,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr "編輯運河"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr "河流"
@@ -14508,5 +14542,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr "編輯河流"
@@ -14514,15 +14548,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr "編輯水域"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr "陸地"
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr "編輯陸地"
@@ -14530,15 +14564,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr "貯水處"
@@ -14546,15 +14580,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr "編輯貯水處"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr "有覆蓋的貯水處"
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr "編輯有覆蓋的貯水處"
@@ -14562,5 +14596,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr "河岸"
@@ -14569,10 +14603,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr "編輯河岸"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr "溼地"
@@ -14583,14 +14617,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr "編輯溼地"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr "沼澤"
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr "泥沼"
@@ -14604,35 +14638,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr "紅樹林"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr "海灘"
@@ -14640,20 +14674,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr "編輯海灘"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr "海灣"
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr "編輯海灣"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr "斷崖"
@@ -14661,10 +14695,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr "編輯斷崖"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr "海岸線"
@@ -14672,5 +14706,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr "編輯海岸線"
@@ -14678,5 +14712,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr "渡輪路線"
@@ -14684,5 +14718,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr "編輯渡輪"
@@ -14691,5 +14725,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr ""
@@ -14697,10 +14731,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr "船塢"
@@ -14708,5 +14742,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr "編輯船塢"
@@ -14714,5 +14748,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr "水壩"
@@ -14720,15 +14754,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr "編輯水壩"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr "水路點"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr "調節水門"
@@ -14737,5 +14771,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr "堰"
@@ -14743,20 +14777,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr "編輯堰"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr "瀑布"
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr "編輯瀑布"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr ""
@@ -14765,15 +14799,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr "碼頭"
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr "編輯碼頭"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr "渡頭"
@@ -14781,10 +14815,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr "編輯渡頭"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr "渡輪端點"
@@ -14792,10 +14826,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr "編輯渡輪端點"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr "船臺"
@@ -14805,5 +14839,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr "編輯造船臺"
@@ -14811,10 +14845,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr "鐵路"
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr "軌"
@@ -14822,5 +14856,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr "編輯軌道"
@@ -14850,8 +14884,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr "選擇性的類型"
@@ -14865,35 +14899,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr "窄軌"
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr "編輯窄軌"
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr "單軌"
@@ -14901,45 +14935,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr "編輯單軌"
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr "保留鐵路"
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr "編輯保留的鐵路"
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr "輕軌電車"
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr "編輯輕軌電車"
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr "地下鐵"
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr "編輯地下鐵"
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr "路面電車"
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr "編輯路面電車"
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr "導軌道巴士"
@@ -14947,5 +14981,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr "編輯導軌道巴士"
@@ -14954,14 +14988,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr "不使用的軌道"
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr "編輯不使用的鐵路"
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr "廢棄的軌道"
@@ -14970,5 +15004,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr "鐵路平交道"
@@ -14977,5 +15011,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr "平交道"
@@ -14985,5 +15019,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr "平交道類型"
@@ -14991,5 +15025,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr "調車轉盤"
@@ -14998,10 +15032,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr "空中路線"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr "滑雪纜車"
@@ -15009,10 +15043,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr "編輯滑雪纜車"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr ""
@@ -15020,10 +15054,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr "纜車"
@@ -15031,10 +15065,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr "編輯纜車"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr ""
@@ -15042,5 +15076,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr ""
@@ -15048,5 +15082,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr "車站"
@@ -15057,10 +15091,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr "編輯車站"
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr "加油站"
@@ -15070,5 +15104,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr "編輯加油站"
@@ -15084,5 +15118,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15092,5 +15126,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr "編輯停車場"
@@ -15098,41 +15132,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr "容量"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr "平面式"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr "塔式"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr "地下"
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr "殘障專用空間"
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr "費用"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr "洗車場"
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr "編輯"
@@ -15140,5 +15174,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr "商店"
@@ -15146,15 +15180,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr "編輯汽車商店"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr "修車場"
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr "編輯修車場"
@@ -15162,5 +15196,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr "租車"
@@ -15169,10 +15203,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr "編輯租車"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr ""
@@ -15180,5 +15214,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr ""
@@ -15186,5 +15220,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr "編輯自行車停車場"
@@ -15193,5 +15227,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr "編輯自行車租用點"
@@ -15200,15 +15234,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr "編輯自行車商店"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr "大眾運輸"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr ""
@@ -15216,5 +15250,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr ""
@@ -15222,5 +15256,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr ""
@@ -15228,5 +15262,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr "路面電車停靠"
@@ -15235,5 +15269,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr "編輯路面電車停靠"
@@ -15241,5 +15275,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr "鐵路月台"
@@ -15248,5 +15282,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr "編輯鐵路月台"
@@ -15258,5 +15292,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr ""
@@ -15264,10 +15298,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr "區域"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr "地下鐵入口"
@@ -15276,10 +15310,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr "編輯地下鐵入口"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr ""
@@ -15288,5 +15322,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr "公車車站"
@@ -15295,5 +15329,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr "編輯公車車站"
@@ -15301,5 +15335,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr "公車站牌"
@@ -15309,5 +15343,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr "編輯公車站牌"
@@ -15318,6 +15352,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr ""
@@ -15325,10 +15359,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr "公車月台"
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr "編輯公車月台"
@@ -15336,5 +15370,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr "計程車"
@@ -15342,5 +15376,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr "編輯計程車招呼站"
@@ -15348,5 +15382,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr "機場"
@@ -15354,15 +15388,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr "編輯機場"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr ""
@@ -15371,5 +15405,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr ""
@@ -15381,5 +15415,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "旅館"
@@ -15388,15 +15422,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr "編輯旅館"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr "星級"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr "汽車旅館"
@@ -15404,20 +15438,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr "編輯汽車旅館"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr ""
@@ -15425,10 +15459,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr ""
@@ -15436,30 +15470,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr "露營區"
@@ -15467,10 +15501,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr "編輯露營區"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr "食物+飲料"
@@ -15481,5 +15515,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "餐廳"
@@ -15487,5 +15521,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr "編輯餐廳"
@@ -15493,5 +15527,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr "烹調風格"
@@ -15499,61 +15533,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr "意大利文"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr "中文"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr "披薩"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr "漢堡"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr "希臘文"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr "德文"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr "印度料理"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr "地方料理"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr "土耳其料理"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr "亞洲料理"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr "泰文"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr "墨西哥料理"
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr "日文"
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr "速食"
@@ -15561,9 +15595,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr "編輯速食餐廳"
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr "咖啡"
@@ -15571,10 +15605,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr "編輯咖啡廳"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr "酒店"
@@ -15582,20 +15616,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr "編輯酒店"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr "酒吧"
@@ -15603,10 +15637,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr "編輯酒吧"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr "夜店"
@@ -15614,20 +15648,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr "編輯夜店"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr "旅遊相關"
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr "吸引力點"
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr "編輯吸引力點"
@@ -15636,11 +15670,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr "博物館"
@@ -15648,10 +15682,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr "編輯博物館"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr "動物園"
@@ -15660,10 +15694,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr "編輯動物園"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr "景點"
@@ -15671,25 +15705,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr "編輯景點"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr "主題樂園"
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr "編輯主題樂園"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr "藝術工作"
@@ -15697,5 +15731,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr "編輯藝術工作"
@@ -15703,5 +15737,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr "資訊服務處"
@@ -15709,80 +15743,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr "編輯資訊服務處"
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "地圖"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr "地圖類型"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr "地圖"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr "城市地圖"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr "健行地圖"
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr "自行車地圖"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
 msgid "Closer Description"
 msgstr ""
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1701
 msgid "Information Board"
 msgstr "資訊板"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Board Type"
 msgstr "板的類型"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "board"
 msgstr ""
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "history"
 msgstr "歷史"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "nature"
 msgstr "自然"
 
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "wildlife"
 msgstr "野生"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Guidepost (Hiking)"
 msgstr "路標（徒步）"
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr "其他的資訊點"
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr ""
@@ -15790,25 +15824,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr "野餐區"
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr "編輯野餐區"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr "歷史地區"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr "城堡"
@@ -15817,20 +15851,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr "編輯城堡"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr "遺跡"
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr "編輯遺跡"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr "考古學地區"
@@ -15839,10 +15873,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr "編輯考古學地區"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr "戰場"
@@ -15850,5 +15884,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr "編輯戰場"
@@ -15856,15 +15890,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr "紀念建築"
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr "編輯紀念建築"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr "紀念碑"
@@ -15872,45 +15906,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr "編輯紀念碑"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr "休閒"
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr "水上樂園"
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr "編輯水上樂園"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr "運動場"
@@ -15918,15 +15952,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr "編輯運動場"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr "釣魚"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr "編輯釣魚場"
@@ -15934,15 +15968,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr "運動設施"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr "競技場"
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr "編輯競技揚"
@@ -15956,6 +15990,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr "選擇運動："
@@ -15978,4 +16012,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -16036,5 +16078,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16044,5 +16094,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16188,5 +16238,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16292,5 +16342,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16331,29 +16381,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr "運動"
@@ -16363,227 +16414,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr "多種"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr "射箭"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr "田徑"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr "澳洲足球"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr "棒球"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr "籃球"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr "保齡球"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr "獨木舟"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr "攀岩"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr "木球"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr "自行車"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr "賽狗"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr "馬術"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr "美式足球"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr "高爾夫"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr "體操"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr "曲棍球"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr "賽馬"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr "摩托車"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr "橄欖球"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr "射擊"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr "滑雪"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr "足球"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr "游泳"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr "桌球"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr "網球"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr "運動中心"
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr "編輯運動中心"
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr "跑道"
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr "編輯跑道"
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr "高爾夫路線"
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr "編輯高爾夫路線"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr "迷你高爾夫"
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr "編輯迷你高爾夫"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr "運動"
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr "多種"
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr "編輯多種"
@@ -16622,191 +16673,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr "運動中心"
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr "競技揚"
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr "田徑"
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr "編輯田徑"
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr "射箭"
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr "編輯射箭"
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr "攀岩"
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr "編輯攀岩"
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr "獨木舟"
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr "編輯獨木舟"
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr "自行車"
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr "編輯自行車"
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr "賽狗"
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr "編輯賽狗"
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr "馬術"
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr "編輯馬術"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr "賽馬"
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr "編輯賽馬"
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr "體操"
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr "編輯體操"
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr "摩托車運動"
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr "編輯摩托車運動"
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr "溜冰"
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr "編輯溜冰"
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr "游泳"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr "編輯游泳"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr "滑雪"
@@ -16814,56 +16865,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr "編輯滑雪"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr "困難度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr "新手"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr "容易"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr "中級"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr "進階"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr "專家"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr "射擊"
@@ -16871,178 +16922,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr "編輯射擊"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr "運動（球類）"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr "足球"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr "編輯足球"
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr "美式足球"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr "編輯美式足球"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr "澳洲足球"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr "編輯澳洲足球"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr "棒球"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr "編輯棒球"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr "籃球"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr "編輯籃球"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr "高爾夫"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr "編輯高爾夫"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr "高爾夫路線"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr "保齡球"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr "編輯保齡球"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr "木球"
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr "編輯木球"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr "曲棍球"
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr "編曲棍球"
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr "回力球"
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr "編輯回力球"
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr "橄欖球"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr "編輯橄欖球"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr "桌球"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr "編輯桌球"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr "網球"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr "編輯網路"
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr "建築物"
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr "建築物"
@@ -17050,5 +17101,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr "公共建築"
@@ -17056,10 +17107,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr "編輯公共建築"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr "縣市政府/公所"
@@ -17067,10 +17118,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr "編輯縣市政府/公所"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr "大使館"
@@ -17078,10 +17129,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr "編輯大使館"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr "法院"
@@ -17090,10 +17141,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr "編輯法院"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr "監獄"
@@ -17102,10 +17153,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr "編輯監獄"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr "警察局"
@@ -17115,10 +17166,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr "編輯警察局"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr "消防隊"
@@ -17127,10 +17178,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr "編輯消防隊"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr "郵局"
@@ -17138,5 +17189,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr "編輯郵局"
@@ -17144,15 +17195,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr "編輯幼稚園"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr "學校"
@@ -17160,10 +17211,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr "編輯學校"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr "大學"
@@ -17171,10 +17222,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr "編輯大學"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr "學院"
@@ -17182,5 +17233,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr "編輯學院"
@@ -17188,5 +17239,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr "電影院"
@@ -17195,10 +17246,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr "編輯電影院"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr "圖書館"
@@ -17207,10 +17258,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr "編輯圖書館"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr "美術館"
@@ -17218,10 +17269,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr "編輯美術館"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr "劇院"
@@ -17230,10 +17281,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr "編輯劇院"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr "宗教儀式場所"
@@ -17243,5 +17294,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr "編輯宗教儀式場所"
@@ -17250,6 +17301,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr "宗教"
@@ -17258,66 +17309,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr "巴海大同教"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr "佛教"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr "基督教系"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr "印度教"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr "耆那教"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr "猶太教"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr "回教"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr "錫克教"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr "祆教"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr "教派"
@@ -17326,81 +17377,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr "英國國教"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr "浸信會"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr "天主教"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr "福音派教會"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr "路德教派"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr "衛理公會教"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr "摩門教"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr "東正教"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr "聖靈降臨教派"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr "長老派教會"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr "新教"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr "教友派"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr "什葉派"
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr "遜尼派"
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr ""
@@ -17409,5 +17460,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr ""
@@ -17415,5 +17466,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr ""
@@ -17421,20 +17472,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr ""
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr "城市名稱"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr "郵遞區號"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr "國碼"
@@ -17442,5 +17493,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr ""
@@ -17449,5 +17500,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -17455,71 +17506,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr "編號規則"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr "奇數"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr "偶數"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr "全部"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr "按字母順序"
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr "人造物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr "作品"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr "編輯作品"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr "塔"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr "編輯塔"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr "貯水塔"
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr "編輯貯水塔"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr "貯氣桶"
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr "編輯貯氣桶"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr "燈塔"
@@ -17527,10 +17578,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr "編輯燈塔"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr "風車"
@@ -17538,10 +17589,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr "編輯風車"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr "油管"
@@ -17549,10 +17600,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr "編輯油管"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr "汙水處理廠"
@@ -17562,10 +17613,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr "編輯汙水處理廠"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr "起重機"
@@ -17573,10 +17624,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr "編輯起重機"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr ""
@@ -17584,10 +17635,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr "測量點"
@@ -17595,10 +17646,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr "編輯測量點"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr "監視"
@@ -17606,5 +17657,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr "編輯監視攝影機"
@@ -17612,5 +17663,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr "發電廠"
@@ -17620,39 +17671,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr "編輯發電廠"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr "風力"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr "水力"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr "燃油"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr "核能"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr "燃媒"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr "光電"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr "天然氣"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr ""
@@ -17661,10 +17712,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr ""
@@ -17673,5 +17724,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -17679,10 +17730,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr "電塔"
@@ -17693,5 +17744,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr "編輯電塔"
@@ -17699,5 +17750,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr "電線"
@@ -17706,25 +17757,25 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr "編輯電線"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr "電壓"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr "線數"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr "便利設施"
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr "廁所"
@@ -17732,20 +17783,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr "郵筒"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr "電話"
@@ -17754,5 +17805,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr "編輯電話"
@@ -17760,5 +17811,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr "硬幣"
@@ -17766,5 +17817,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr ""
@@ -17772,5 +17823,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr "電子錢包或收費卡"
@@ -17778,5 +17829,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr ""
@@ -17784,15 +17835,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr "信用卡"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr "電話卡"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr "資源回收"
@@ -17801,5 +17852,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr "資源回收站"
@@ -17807,35 +17858,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr "電池"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr "瓶罐"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr "衣服"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr "玻璃"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr "紙張"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr "廢金屬"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr "長椅"
@@ -17844,20 +17895,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr ""
@@ -17865,22 +17916,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr "噴泉"
@@ -17889,10 +17940,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr "編輯噴泉"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr "飲水機"
@@ -17901,10 +17952,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr "編輯飲水機"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr ""
@@ -17912,25 +17963,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr "商店"
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr "超級市場"
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr "編輯超級市場"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr "便利商店"
@@ -17938,10 +17989,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr "編輯便利商店"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr ""
@@ -17949,10 +18000,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr ""
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr "自動販賣機"
@@ -17960,5 +18011,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr "編輯自動販賣機"
@@ -17966,88 +18017,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr "販賣產品"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr "食物"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr "飲料"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr "甜點"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr "菸"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr "相片"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr "飼料"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr "報紙"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr "玩具"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr "郵票"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr "SIM-卡"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr "保險套"
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr "肉類"
@@ -18055,10 +18106,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr "編輯肉店"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr "麵包類"
@@ -18066,10 +18117,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr "編輯麵包店"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr "花類"
@@ -18077,20 +18128,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr "編輯花店"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr "有機產品"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr "編輯有機產品商店"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr "酒類"
@@ -18098,60 +18149,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr "編輯賣酒的商店"
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr "飲料類"
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr "編輯飲料店"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr "電腦類"
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr "編輯電腦商店"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr "電子材料"
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr "編輯電子材料行"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr "編輯 Hifi 音響店"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr "傢俱類"
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr "編輯傢俱店"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr "園藝中心"
@@ -18159,10 +18210,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr "編輯園藝中心"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr ""
@@ -18170,10 +18221,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr "DIY 商店"
@@ -18181,60 +18232,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr "編輯 DIY 商店"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr "文具類"
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr "編輯文具店"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr "美髮類"
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr "編輯美髮店"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr "鞋類"
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr "編輯鞋店"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr "玩具類"
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr "編輯玩具店"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr "影片類"
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr "編輯影片類商店"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr "乾洗類"
@@ -18242,10 +18293,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr "編輯乾洗店"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr "洗衣店"
@@ -18253,10 +18304,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr "編輯洗衣店"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr "戶外用品"
@@ -18264,35 +18315,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr "編輯戶外用品店"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr "運動用品"
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr "編輯運動用品店"
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr "眼鏡類"
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr "編輯眼鏡行"
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr "現金"
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr "銀行"
@@ -18300,5 +18351,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr "編輯銀行"
@@ -18306,10 +18357,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr "自動提款機(ATM)"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr ""
@@ -18317,5 +18368,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr ""
@@ -18323,15 +18374,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr "編輯自動提款機"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr "健康"
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr "醫師"
@@ -18339,20 +18390,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr "編輯醫師"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr "牙醫"
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr "編輯牙醫"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr "藥局"
@@ -18360,5 +18411,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr "編輯藥局"
@@ -18366,10 +18417,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr "配藥"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr "醫院"
@@ -18377,10 +18428,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr "編輯醫院"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr ""
@@ -18389,5 +18440,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -18396,20 +18447,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr "電話號碼"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(使用國際碼，像是 +12-345-67890)"
@@ -18417,5 +18468,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr "獸醫"
@@ -18424,56 +18475,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr "編輯獸醫"
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr ""
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr ""
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr ""
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr ""
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr "縣"
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr "編輯縣"
@@ -18481,15 +18531,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr "市"
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr "編輯市"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr "鄉/鎮"
@@ -18497,10 +18547,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr "編輯鄉/鎮"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr "郊區"
@@ -18508,25 +18558,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr "編輯郊區"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr "村/里"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr "編輯村/里"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr ""
@@ -18534,5 +18584,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr ""
@@ -18540,10 +18590,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr "島嶼"
@@ -18551,5 +18601,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr "編輯島嶼"
@@ -18557,5 +18607,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr "洞窟入口"
@@ -18563,10 +18613,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr "編輯洞窟入口"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr "峰"
@@ -18574,10 +18624,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr "編輯山峰"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr "冰河"
@@ -18585,10 +18635,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr "編輯冰河"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr "火山"
@@ -18596,70 +18646,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr "編輯火山"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr "邊界"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr "國界"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr "編輯國界"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr "行政區"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr "編輯行政區邊界"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr "城市的"
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr "編輯城市邊界"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr "政治的"
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr "編輯政治的邊界"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr "國家公園"
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr "編輯國家公園"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr "樹"
@@ -18668,15 +18718,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr "編輯樹"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr "植物學名"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr ""
@@ -18685,5 +18735,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr ""
@@ -18691,17 +18741,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr "松類"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr "落葉類"
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr "混合"
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr "森林"
@@ -18710,14 +18760,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr "編輯森林土地利用"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr "自然保育"
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr "編輯自然保育"
@@ -18725,25 +18775,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr ""
@@ -18751,10 +18801,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr ""
@@ -18762,5 +18812,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr ""
@@ -18768,5 +18818,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr ""
@@ -18775,45 +18825,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -18821,25 +18871,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr "花園"
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr "編輯花園"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr "草地"
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr ""
@@ -18847,10 +18897,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr ""
@@ -18858,20 +18908,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr ""
@@ -18879,5 +18929,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -18885,15 +18935,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr ""
@@ -18901,9 +18951,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr ""
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr ""
@@ -18911,39 +18961,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr ""
@@ -18951,15 +19001,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr ""
@@ -18967,55 +19017,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr ""
@@ -19025,5 +19075,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr ""
@@ -19032,10 +19082,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr ""
@@ -19043,5 +19093,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr ""
@@ -19050,5 +19100,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -19056,34 +19106,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr ""
@@ -19092,15 +19142,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr ""
@@ -19108,5 +19158,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr ""
@@ -19115,5 +19165,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr ""
@@ -19121,5 +19171,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr ""
@@ -19191,24 +19241,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr "單車"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr "公車"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr "道路"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr "渡輪"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr ""
@@ -19261,20 +19311,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr "健行"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr ""
@@ -19288,10 +19338,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr ""
@@ -19299,26 +19349,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr "網路"
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "旋轉"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr ""
@@ -19327,30 +19383,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr ""
@@ -19386,6 +19442,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19401,5 +19458,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. 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 havin 8 hex digits instead of 6).
+#. 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,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. 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
@@ -19418,5 +19483,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr ""
@@ -19510,7 +19575,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr ""
@@ -19775,15 +19840,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr ""
@@ -19825,5 +19890,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr ""
@@ -19961,4 +20026,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19970,5 +20041,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19976,5 +20047,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20011,5 +20082,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20033,11 +20104,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr ""
@@ -20061,5 +20132,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20100,5 +20171,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20136,6 +20207,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr ""
@@ -20191,7 +20262,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr ""
@@ -20244,11 +20315,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr ""
@@ -20269,5 +20348,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr ""
@@ -20281,5 +20360,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr ""
@@ -20300,5 +20379,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr ""
@@ -20312,6 +20391,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr ""
@@ -20326,5 +20405,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr ""
@@ -20338,5 +20417,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr ""
@@ -20350,5 +20429,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr ""
@@ -20376,5 +20455,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr ""
@@ -20517,5 +20596,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20542,13 +20621,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr ""
@@ -20610,7 +20689,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr ""
@@ -20633,10 +20712,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr ""
@@ -20672,7 +20751,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr ""
@@ -20717,6 +20796,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr ""
@@ -20730,5 +20809,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr ""
@@ -20750,5 +20829,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr ""
@@ -20762,5 +20841,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr ""
@@ -20768,4 +20847,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20808,7 +20894,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr ""
@@ -20825,5 +20911,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr ""
@@ -20838,5 +20924,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr ""
@@ -20851,5 +20937,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr ""
@@ -20864,5 +20950,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr ""
@@ -20877,5 +20963,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr ""
@@ -20890,5 +20976,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr ""
@@ -20911,4 +20997,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -20919,4 +21012,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -20993,10 +21094,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr ""
@@ -21010,5 +21112,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr ""
@@ -21022,5 +21124,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr ""
@@ -21148,12 +21250,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr ""
@@ -21167,5 +21269,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr ""
@@ -21237,8 +21339,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr ""
@@ -21340,10 +21442,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr ""
@@ -21363,4 +21465,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21382,4 +21491,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21703,4 +21819,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -21727,24 +21851,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr ""
@@ -21776,6 +21908,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr ""
@@ -21836,8 +21968,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr ""
@@ -22190,26 +22322,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr ""
@@ -22264,5 +22396,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22281,8 +22413,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr ""
@@ -22432,9 +22564,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr ""
@@ -22506,8 +22638,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr ""
@@ -22578,8 +22710,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr ""
@@ -22593,5 +22725,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr ""
@@ -22605,5 +22737,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr ""
@@ -22625,5 +22757,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr ""
@@ -22637,5 +22769,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr ""
@@ -22649,5 +22781,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr ""
@@ -22670,5 +22802,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr ""
@@ -22682,5 +22814,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr ""
@@ -22694,5 +22826,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr ""
@@ -22706,5 +22838,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr ""
@@ -22718,5 +22850,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr ""
@@ -22773,7 +22905,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr ""
@@ -22787,5 +22919,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr ""
@@ -22798,5 +22930,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr ""
@@ -22811,5 +22943,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr ""
@@ -22823,5 +22955,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr ""
@@ -22876,8 +23008,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr ""
@@ -22891,5 +23023,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr ""
@@ -22903,5 +23035,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr ""
@@ -22915,5 +23047,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr ""
@@ -22927,5 +23059,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr ""
@@ -22939,5 +23071,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr ""
@@ -23015,8 +23147,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr ""
@@ -23064,7 +23196,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr ""
@@ -23206,10 +23338,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr ""
@@ -23257,6 +23389,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr ""
@@ -23556,21 +23688,9 @@
 #~ msgstr "未命名的"
 
+#~ msgid "Some of the nodes are (almost) in the line"
+#~ msgstr "節點中有部分(幾乎)在直線裡"
+
 #~ msgid "Unknown file extension."
 #~ msgstr "不明的延伸檔名。"
-
-#~ msgid "Move"
-#~ msgstr "移動"
-
-#~ msgid "Invalid projection"
-#~ msgstr "無效的投影"
-
-#~ msgid "Change the projection to {0} first."
-#~ msgstr "先將投影改變為 {0}。"
-
-#~ msgid "end"
-#~ msgstr "結束"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "節點中有部分(幾乎)在直線裡"
 
 #~ msgid ""
@@ -23588,6 +23708,6 @@
 #~ msgstr "改變"
 
-#~ msgid "Rotate"
-#~ msgstr "旋轉"
+#~ msgid "Move"
+#~ msgstr "移動"
 
 #~ msgid "EPSG:4326"
@@ -23695,4 +23815,7 @@
 #~ msgstr "標籤預設組合來源"
 
+#~ msgid "Invalid projection"
+#~ msgstr "無效的投影"
+
 #~ msgid "YAHOO (GNOME)"
 #~ msgstr "YAHOO (GNOME)"
@@ -23724,7 +23847,13 @@
 #~ msgstr "檢驗目前的選擇區域或整個資料組合。"
 
+#~ msgid "Change the projection to {0} first."
+#~ msgstr "先將投影改變為 {0}。"
+
 #~ msgid "Failed to initialize API. Please try again later."
 #~ msgstr "初始化 API 失敗。請稍後再試一次。"
 
+#~ msgid "end"
+#~ msgstr "結束"
+
 #~ msgid "Import TCX File..."
 #~ msgstr "匯入 TCX 檔案..."
